From 490cb834899c80edd94ad143b0bfc6df0acd606d Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 14 Mar 2017 15:03:01 -0700
Subject: [PATCH] move advanced movement control changes to MyAvatar

---
 interface/src/avatar/MyAvatar.h                    |  3 +++
 .../toggleAdvancedMovementForHandControllers.js    | 14 ++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/interface/src/avatar/MyAvatar.h b/interface/src/avatar/MyAvatar.h
index 1a5883edca..f892a8d8b7 100644
--- a/interface/src/avatar/MyAvatar.h
+++ b/interface/src/avatar/MyAvatar.h
@@ -86,6 +86,7 @@ class MyAvatar : public Avatar {
 
     Q_PROPERTY(bool hmdLeanRecenterEnabled READ getHMDLeanRecenterEnabled WRITE setHMDLeanRecenterEnabled)
     Q_PROPERTY(bool characterControllerEnabled READ getCharacterControllerEnabled WRITE setCharacterControllerEnabled)
+    Q_PROPERTY(bool useAdvancedMovementControls READ useAdvancedMovementControls WRITE setUseAdvancedMovementControls)
 
 public:
     explicit MyAvatar(RigPointer rig);
@@ -172,6 +173,8 @@ public:
     Q_INVOKABLE bool getHMDLeanRecenterEnabled() const { return _hmdLeanRecenterEnabled; }
 
     bool useAdvancedMovementControls() const { return _useAdvancedMovementControls.get(); }
+    void setUseAdvancedMovementControls(bool useAdvancedMovementControls)
+        { _useAdvancedMovementControls.set(useAdvancedMovementControls); }
 
     // get/set avatar data
     void saveData();
diff --git a/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js b/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
index 61d2df5d9e..a453e50d1b 100644
--- a/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
+++ b/scripts/system/controllers/toggleAdvancedMovementForHandControllers.js
@@ -17,15 +17,14 @@ var mappingName, basicMapping, isChecked;
 
 var TURN_RATE = 1000;
 var MENU_ITEM_NAME = "Advanced Movement For Hand Controllers";
-var SETTINGS_KEY = 'advancedMovementForHandControllersIsChecked';
 var isDisabled = false;
-var previousSetting = Settings.getValue(SETTINGS_KEY);
-if (previousSetting === '' || previousSetting === false || previousSetting === 'false') {
+var previousSetting = MyAvatar.useAdvancedMovementControls;
+if (previousSetting === false) {
     previousSetting = false;
     isChecked = false;
 }
 
-if (previousSetting === true || previousSetting === 'true') {
+if (previousSetting === true) {
     previousSetting = true;
     isChecked = true;
 }
@@ -37,7 +36,6 @@ function addAdvancedMovementItemToSettingsMenu() {
         isCheckable: true,
         isChecked: previousSetting
     });
-
 }
 
 function rotate180() {
@@ -111,10 +109,10 @@ function menuItemEvent(menuItem) {
     if (menuItem == MENU_ITEM_NAME) {
         isChecked = Menu.isOptionChecked(MENU_ITEM_NAME);
         if (isChecked === true) {
-            Settings.setValue(SETTINGS_KEY, true);
+            MyAvatar.setUseAdvancedMovementControls(true);
             disableMappings();
-        } else if (isChecked === false) {
-            Settings.setValue(SETTINGS_KEY, false);
+        } else if (isChecked === false)
+            MyAvatar.setUseAdvancedMovementControls(true);
             enableMappings();
         }
     }