summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-01-14 12:18:44 -0500
committerOz Linden <oz@lindenlab.com>2013-01-14 12:18:44 -0500
commitdb2d6816b1a4e3b48d2e22cc2beb12ebff001079 (patch)
treef455db270210d844717e7299db0bb435edc4ff92 /indra/newview
parentcb676675335791d9dacd032c389a0346c725d9d7 (diff)
parentc842494b774eedc6066f317853a82586ab85524e (diff)
merge changes for 3.4.5-beta2
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerkeyboard.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp
index f5d3341c66..1aa9fd8a45 100644
--- a/indra/newview/llviewerkeyboard.cpp
+++ b/indra/newview/llviewerkeyboard.cpp
@@ -160,11 +160,6 @@ void agent_push_backward( EKeystate s )
camera_move_backward(s);
return;
}
- else if (gAgentAvatarp->isSitting())
- {
- gAgentCamera.changeCameraToThirdPerson();
- return;
- }
agent_push_forwardbackward(s, -1, LLAgent::DOUBLETAP_BACKWARD);
}