1 files changed, 6 insertions, 1 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index dcd2a2f98d..c99f7365ab 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -4811,6 +4811,7 @@ void LLAppViewer::idle()
 
         send_agent_update(false);
 
+        // Some GameControl stuff needs to be executed even when the feature is not enabled
         // Note: we process game_control before sending AgentUpdate
         // because it may translate to control flags that control avatar motion.
         LLGameControl::processEvents(gFocusMgr.getAppHasFocus());
@@ -4832,7 +4833,11 @@ void LLAppViewer::idle()
             sendGameControlInput();
         }
 
-        gAgent.setExternalActionFlags(action_flags);
+        // This GameControl stuff should NOT be executed when it isn't enabled
+        if (LLGameControl::isEnabled())
+        {
+            gAgent.setExternalActionFlags(action_flags);
+        }
 
         // When appropriate, update agent location to the simulator.
         F32 agent_update_time = agent_update_timer.getElapsedTimeF32();