add support for running

1 files changed, 8 insertions, 2 deletions

diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp
index e452c39a35..83888657bc 100644
--- a/indra/newview/llappviewer.cpp
+++ b/indra/newview/llappviewer.cpp
@@ -5408,11 +5408,17 @@ void LLAppViewer::idle()
         // current avatar state so the runtime mappings and gating track it.
         gAgent.updateGameControlMode();
 
-        // get control flags from each side
+        // Read the agent's control flags now, before applyExternalActions() below
+        // (which drives the avatar from a real game controller) has a chance to
+        // fold any controller-driven movement into them this frame -- so the
+        // keyboard-derived GameControl state computed here can never be sourced
+        // from the controller's own output.  See LLGameControllerManager::
+        // setExternalInput()/accumulateFinalState() for where the two are
+        // combined (only as fully-independent final ServerStates).
         U32 control_flags = gAgent.getControlFlags();
 
         // apply to GameControl
-        LLGameControl::setExternalInput(control_flags, gAgent.getGameControlButtonsFromKeys());
+        LLGameControl::setExternalInput(control_flags, gAgent.getGameControlButtonsFromKeys(), gAgent.getRunning());
         if (LLPanelPreferenceGameControl::isWaitingForInputChannel())
         {
             LLPanelPreferenceGameControl::applyGameControlInput();