summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2015-10-15 12:22:58 +0300
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2015-10-15 12:22:58 +0300
commit64f000c73299596adcfb60e59c8baa79a11bceca (patch)
tree9d0a0b0a33e82e6c4f1980d1d6b50a27c37c3605
parent43e06e0352cd7ea1984f80449c74160a0b1f49aa (diff)
MAINT-5738 FIXED If "Always Run" is enabled, camming is broken when sitting down.
-rwxr-xr-xindra/newview/llviewerkeyboard.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index ada829eb4b..f36d602ae5 100755
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -423,7 +423,7 @@ void camera_move_backward( EKeystate s )
void camera_move_forward_sitting( EKeystate s )
{
if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_FORWARD ) return;
- if (gAgent.forwardGrabbed() || gAgentCamera.sitCameraEnabled() || gAgent.getRunning())
+ if (gAgent.forwardGrabbed() || gAgentCamera.sitCameraEnabled() || (gAgent.getRunning() && !gAgent.getAlwaysRun()))
{
agent_push_forward(s);
}
@@ -438,7 +438,7 @@ void camera_move_backward_sitting( EKeystate s )
{
if( KEYSTATE_UP == s && gAgent.mDoubleTapRunMode != LLAgent::DOUBLETAP_BACKWARD ) return;
- if (gAgent.backwardGrabbed() || gAgentCamera.sitCameraEnabled() || gAgent.getRunning())
+ if (gAgent.backwardGrabbed() || gAgentCamera.sitCameraEnabled() || (gAgent.getRunning() && !gAgent.getAlwaysRun()))
{
agent_push_backward(s);
}