From 4150d318d318b3747e5d57f8b8d77df6ce958c17 Mon Sep 17 00:00:00 2001
From: howard-stearns <howard.stearns@gmail.com>
Date: Mon, 15 Feb 2016 13:39:53 -0800
Subject: [PATCH] "Leave it on by default" (and change name of route variable
 to SnapTurn).

---
 interface/resources/controllers/keyboardMouse.json | 6 +++---
 interface/resources/controllers/standard.json      | 2 +-
 interface/src/Application.cpp                      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/interface/resources/controllers/keyboardMouse.json b/interface/resources/controllers/keyboardMouse.json
index 5d7930a59b..c76c35b86e 100644
--- a/interface/resources/controllers/keyboardMouse.json
+++ b/interface/resources/controllers/keyboardMouse.json
@@ -18,7 +18,7 @@
                 [ "Keyboard.MouseMoveRight" ] 
             ]
           },
-          "when": [ "Application.InHMD", "Application.ComfortMode", "Keyboard.RightMouseButton" ],
+          "when": [ "Application.SnapTurn", "Keyboard.RightMouseButton" ],
           "to": "Actions.StepYaw",
           "filters":
             [
@@ -34,7 +34,7 @@
                 [ "Keyboard.TouchpadRight" ] 
             ] 
           },
-          "when": [ "Application.InHMD", "Application.ComfortMode" ],
+          "when": [ "Application.SnapTurn" ],
           "to": "Actions.StepYaw",
           "filters":
             [
@@ -49,7 +49,7 @@
                 ["Keyboard.D", "Keyboard.Right"]
             ]
           },
-          "when": [ "Application.InHMD", "Application.ComfortMode" ],
+          "when": [ "Application.SnapTurn" ],
           "to": "Actions.StepYaw",
           "filters":
             [
diff --git a/interface/resources/controllers/standard.json b/interface/resources/controllers/standard.json
index 6a8fc0d803..e1308545a3 100644
--- a/interface/resources/controllers/standard.json
+++ b/interface/resources/controllers/standard.json
@@ -5,7 +5,7 @@
         { "from": "Standard.LX", "to": "Actions.TranslateX" },
 
         { "from": "Standard.RX",
-          "when": [ "Application.InHMD", "Application.ComfortMode" ],
+          "when": [ "Application.SnapTurn" ],
           "to": "Actions.StepYaw",
           "filters":
             [
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c8b2e89432..fd58c5b1da 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -849,7 +849,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
     _applicationStateDevice->addInputVariant(QString("InHMD"), controller::StateController::ReadLambda([]() -> float {
         return (float)qApp->getAvatarUpdater()->isHMDMode();
     }));
-    _applicationStateDevice->addInputVariant(QString("ComfortMode"), controller::StateController::ReadLambda([]() -> float {
+    _applicationStateDevice->addInputVariant(QString("SnapTurn"), controller::StateController::ReadLambda([]() -> float {
         return (float)qApp->getMyAvatar()->getSnapTurn();
     }));
     _applicationStateDevice->addInputVariant(QString("Grounded"), controller::StateController::ReadLambda([]() -> float {