From 13a12a2a13279f45dd20659380786966ca19f56f Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@highfidelity.io>
Date: Thu, 11 Aug 2016 18:07:29 -0700
Subject: [PATCH] Script.include() default scripts not Script.load()

---
 scripts/defaultScripts.js | 90 ++++++++++++++++++++++++++++++---------
 1 file changed, 70 insertions(+), 20 deletions(-)

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 5aa3c6945b..c7ea18d883 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -8,25 +8,75 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
+var DEFAULT_SCRIPTS = [
+    "system/progress.js",
+    "system/away.js",
+    "system/users.js",
+    "system/mute.js",
+    "system/goto.js",
+    "system/hmd.js",
+    "system/marketplaces/marketplace.js",
+    "system/edit.js",
+    "system/mod.js",
+    "system/selectAudioDevice.js",
+    "system/notifications.js",
+    "system/controllers/handControllerGrab.js",
+    "system/controllers/handControllerPointer.js",
+    "system/controllers/squeezeHands.js",
+    "system/controllers/grab.js",
+    "system/controllers/teleport.js",
+    "system/controllers/toggleAdvancedMovementForHandControllers.js,
+    "system/dialTone.js",
+    "system/firstPersonHMD.js",
+    "system/snapshot.js"
+];
 
-Script.load("system/progress.js");
-Script.load("system/away.js");
-Script.load("system/users.js");
-Script.load("system/mute.js");
-Script.load("system/goto.js");
-Script.load("system/hmd.js");
-Script.load("system/marketplaces/marketplace.js");
-Script.load("system/edit.js");
-Script.load("system/mod.js");
-Script.load("system/selectAudioDevice.js");
-Script.load("system/notifications.js");
-Script.load("system/controllers/handControllerGrab.js");
-Script.load("system/controllers/handControllerPointer.js");
-Script.load("system/controllers/squeezeHands.js");
-Script.load("system/controllers/grab.js");
-Script.load("system/controllers/teleport.js");
-Script.load("system/controllers/toggleAdvancedMovementForHandControllers.js")
-Script.load("system/dialTone.js");
-Script.load("system/firstPersonHMD.js");
-Script.load("system/snapshot.js");
+// add a menu item for debugging
+var MENU_CATEGORY = "Developer"
+var MENU_ITEM = "Debug defaultScripts.js";
+var debuggingDefaultScripts = false;
 
+if (Menu.menuExists(MENU_CATEGORY) && !Menu.menuItemExists(MENU_CATEGORY, MENU_ITEM)) {
+    Menu.addMenuItem({
+        menuName: MENU_CATEGORY,
+        menuItemName: MENU_ITEM,
+        isCheckable: true,
+        isChecked: false,
+        grouping: "Advanced"
+    });
+}
+
+// start all scripts
+if (Menu.isOptionChecked(MENU_ITEM)) {
+    // we're debugging individual default scripts
+    // so we load each into its own ScriptEngine instance
+    debuggingDefaultScripts = true;
+    for (var i in DEFAULT_SCRIPTS) {
+        Script.load(DEFAULT_SCRIPTS[i]);
+    }
+} else {
+    // include all default scripts into this ScriptEngine
+    for (var i in DEFAULT_SCRIPTS) {
+        Script.include(DEFAULT_SCRIPTS[i]);
+    }
+}
+
+function stopLoadedScripts() {
+    if (debuggingDefaultScripts) {
+        // remove debug script loads
+        var runningScripts = ScriptDiscoveryService.getRunning();
+        for (var i in runningScripts) {
+            var scriptName = runningScripts[i].name;
+            for (var j in DEFAULT_SCRIPTS) {
+                if (DEFAULT_SCRIPTS[j].slice(-scriptName.length) == scriptName) {
+                    ScriptDiscoveryService.stopScript(runningScripts[i].url);
+                }
+            }
+        }
+        if (!Menu.isOptionChecked(MENU_ITEM)) {
+            Menu.removeMenuItem(MENU_CATEGORY, MENU_ITEM);
+        }
+    }
+}
+
+Script.scriptEnding.connect(stopLoadedScripts);