summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerkeyboard.cpp
diff options
context:
space:
mode:
authorSimon Linden <simon@lindenlab.com>2014-07-18 22:39:50 +0000
committerSimon Linden <simon@lindenlab.com>2014-07-18 22:39:50 +0000
commit7021288859036789dc268233cc1a3401d6082721 (patch)
tree2d6a4d9e87785a8bc236215e5e0102a553a0ee5f /indra/newview/llviewerkeyboard.cpp
parent7714c7679da7c6c28c3f3f09af6b586a680dc26c (diff)
parent19bc1ee671df2f89d990dfe8aadea1d9ea424e82 (diff)
Pull in viewer-lion to cut off DRTVWR-373
Diffstat (limited to 'indra/newview/llviewerkeyboard.cpp')
-rwxr-xr-xindra/newview/llviewerkeyboard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index 160478788c..b0f4802e20 100755
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -162,7 +162,7 @@ void agent_push_backward( EKeystate s )
{
camera_move_backward(s);
}
- else if (!gAgent.backwardGrabbed() && gAgentAvatarp->isSitting())
+ else if (!gAgent.backwardGrabbed() && gAgentAvatarp->isSitting() && gSavedSettings.getBOOL("LeaveMouselook"))
{
gAgentCamera.changeCameraToThirdPerson();
}