From 7768e65e8bf0574df4766b2b0e66c7aef48efc19 Mon Sep 17 00:00:00 2001
From: "James B. Pollack" <jamesbradenpollack@gmail.com>
Date: Thu, 18 Aug 2016 09:22:43 -0700
Subject: [PATCH] update name

---
 scripts/defaultScripts.js                      |  4 +---
 scripts/system/controllers/advancedMovement.js | 10 +++++-----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js
index 57a5a2067a..feb9d8c2d6 100644
--- a/scripts/defaultScripts.js
+++ b/scripts/defaultScripts.js
@@ -26,8 +26,6 @@ Script.load("system/controllers/handControllerPointer.js");
 Script.load("system/controllers/squeezeHands.js");
 Script.load("system/controllers/grab.js");
 Script.load("system/controllers/teleport.js");
-if (Controller.Hardware.Vive !== undefined) {
-    Script.load("system/controllers/advancedMovement.js")
-}
+Script.load("system/controllers/advancedMovement.js")
 Script.load("system/dialTone.js");
 Script.load("system/firstPersonHMD.js");
\ No newline at end of file
diff --git a/scripts/system/controllers/advancedMovement.js b/scripts/system/controllers/advancedMovement.js
index 620bd2723f..73856cb045 100644
--- a/scripts/system/controllers/advancedMovement.js
+++ b/scripts/system/controllers/advancedMovement.js
@@ -3,7 +3,7 @@ var mappingName, advancedMapping;
 function addAdvancedMovementItemToSettingsMenu() {
     Menu.addMenuItem({
         menuName: "Settings",
-        menuItemName: "Advanced Movement",
+        menuItemName: "Advanced Movement (Vive)",
         isCheckable: true,
         isChecked: false
     });
@@ -31,14 +31,14 @@ function removeTranslationFromLeftStick() {
 }
 
 function scriptEnding() {
-    Menu.removeMenuItem("Settings", "Advanced Movement");
+    Menu.removeMenuItem("Settings", "Advanced Movement (Vive)");
     removeTranslationFromLeftStick();
 }
 
 function menuItemEvent(menuItem) {
-    if (menuItem == "Advanced Movement") {
-        print("  checked=" + Menu.isOptionChecked("Advanced Movement"));
-        var isChecked = Menu.isOptionChecked("Advanced Movement");
+    if (menuItem == "Advanced Movement (Vive)") {
+        print("  checked=" + Menu.isOptionChecked("Advanced Movement (Vive)"));
+        var isChecked = Menu.isOptionChecked("Advanced Movement (Vive)");
         if (isChecked === true) {
             addTranslationToLeftStick();
         } else if (isChecked === false) {