From 3d0e0da42f0b3f9af1956a13bfaf4347d8a99a6d Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Thu, 24 May 2018 11:08:26 -0700
Subject: [PATCH 1/3] re-adding removed toggleSpaceMode function

---
 .../system/libraries/entitySelectionTool.js   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index d03d4477f7..1b41559160 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1036,6 +1036,29 @@ SelectionDisplay = (function() {
         }
     };
 
+    // FUNCTION: TOGGLE SPACE MODE
+    that.toggleSpaceMode = function() {
+        var wantDebug = false;
+        if (wantDebug) {
+            print("========> ToggleSpaceMode called. =========");
+        }
+        if ((spaceMode === SPACE_WORLD) && (SelectionManager.selections.length > 1)) {
+            if (wantDebug) {
+                print("Local space editing is not available with multiple selections");
+            }
+            return;
+        }
+        if (wantDebug) {
+            print("PreToggle: " + spaceMode);
+        }
+        spaceMode = (spaceMode === SPACE_LOCAL) ? SPACE_WORLD : SPACE_LOCAL;
+        that.updateHandles();
+        if (wantDebug) {
+            print("PostToggle: " + spaceMode);        
+            print("======== ToggleSpaceMode called. <=========");
+        }
+    };
+
     function addHandleTool(overlay, tool) {
         handleTools[overlay] = tool;
         return tool;

From 89f7eb0b301e99ae908f212f807af9eee496eb5d Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Fri, 25 May 2018 09:20:55 -0700
Subject: [PATCH 2/3] Adding fix for enabling saved front/back advanced
 controls.

---
 ...oggleAdvancedMovementForHandControllers.js | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js b/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
index a1b96ac607..2f3a1d9628 100644
--- a/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
+++ b/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
@@ -171,4 +171,25 @@
     Messages.subscribe(HIFI_ADVANCED_MOVEMENT_DISABLER_CHANNEL);
     Messages.messageReceived.connect(handleMessage);
 
+    function initializeControls() {
+        if(HMD.active) {
+            if (Controller.Hardware.Vive !== undefined || Controller.Hardware.OculusTouch !== undefined) {
+                if (MyAvatar.useAdvancedMovementControls) {
+                    Controller.disableMapping(DRIVING_MAPPING_NAME);
+                } else {
+                    Controller.enableMapping(DRIVING_MAPPING_NAME);
+                }
+
+                if (MyAvatar.getFlyingEnabled()) {
+                    Controller.disableMapping(FLYING_MAPPING_NAME);
+                } else {
+                    Controller.enableMapping(FLYING_MAPPING_NAME);
+                }
+			});
+
+		}
+	}
+
+	initializeControls();
+
 }()); // END LOCAL_SCOPE

From 8453c7baba9ada9bf890f8ae380a7a63e0e3de37 Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Fri, 25 May 2018 09:25:05 -0700
Subject: [PATCH 3/3] =?UTF-8?q?reverting=20commit=20=C2=9D802cedf1bc=20reg?=
 =?UTF-8?q?arding=20toggleSpaceMode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/libraries/entitySelectionTool.js   | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/scripts/system/libraries/entitySelectionTool.js b/scripts/system/libraries/entitySelectionTool.js
index 1b41559160..d03d4477f7 100644
--- a/scripts/system/libraries/entitySelectionTool.js
+++ b/scripts/system/libraries/entitySelectionTool.js
@@ -1036,29 +1036,6 @@ SelectionDisplay = (function() {
         }
     };
 
-    // FUNCTION: TOGGLE SPACE MODE
-    that.toggleSpaceMode = function() {
-        var wantDebug = false;
-        if (wantDebug) {
-            print("========> ToggleSpaceMode called. =========");
-        }
-        if ((spaceMode === SPACE_WORLD) && (SelectionManager.selections.length > 1)) {
-            if (wantDebug) {
-                print("Local space editing is not available with multiple selections");
-            }
-            return;
-        }
-        if (wantDebug) {
-            print("PreToggle: " + spaceMode);
-        }
-        spaceMode = (spaceMode === SPACE_LOCAL) ? SPACE_WORLD : SPACE_LOCAL;
-        that.updateHandles();
-        if (wantDebug) {
-            print("PostToggle: " + spaceMode);        
-            print("======== ToggleSpaceMode called. <=========");
-        }
-    };
-
     function addHandleTool(overlay, tool) {
         handleTools[overlay] = tool;
         return tool;