diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-14 09:50:14 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-14 09:50:14 -0500 |
| commit | 2e4e3c91bb328a16a5a80abcc878ba01ff93ad73 (patch) | |
| tree | 1dd5ee844e29e6d764046ce0fbc08e114bbb589f | |
| parent | 9f21775788be9b1684460d2771ebde1b36d713b3 (diff) | |
| parent | 33d77848902972cd2814c86dda40d81068bdd8e3 (diff) | |
merge changes for DRTVWR-283
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerkeyboard.cpp | 5 |
2 files changed, 1 insertions, 5 deletions
@@ -403,3 +403,4 @@ af6b711a97073431953b55ee808aaa09900c27e5 DRTVWR-276 c296133849d1f103c0e2abc41e6599daed00b67b DRTVWR-280 40a2265058abc9fde4914c10185f916435818621 3.4.5-beta1 5df4802bec93c8d0a509946d826bb4c50c5442ec DRTVWR-281 +7c1c33ba4cfd2d15ca51cc1ac440eca551331a4a DRTVWR-283 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); } |