diff options
| author | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-05-13 11:27:06 +0300 |
|---|---|---|
| committer | Mnikolenko ProductEngine <mnikolenko@productengine.com> | 2014-05-13 11:27:06 +0300 |
| commit | d2efc4ef39b9e1994afa5c3e84a5785969c9e7e8 (patch) | |
| tree | 9d143448f57a5cbdeca016af2e4b7ce38f0e7e10 /indra | |
| parent | ccb91c6da4078ce5d977203f297b0197983a543e (diff) | |
MAINT-4013 FIXED Debug setting which allows leaving Mouselook mode via S or Down Arrow keys was added. By default it's disabled.
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/app_settings/settings.xml | 11 | ||||
| -rwxr-xr-x | indra/newview/llviewerkeyboard.cpp | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 4bbd48facf..c2555efbb5 100755 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -14246,6 +14246,17 @@ <key>Value</key> <integer>0</integer> </map> + <key>LeaveMouselook</key> + <map> + <key>Comment</key> + <string>Exit Mouselook mode via S or Down Arrow keys while sitting </string> + <key>Persist</key> + <integer>1</integer> + <key>Type</key> + <string>Boolean</string> + <key>Value</key> + <integer>0</integer> + </map> <key>TextureLoggingThreshold</key> <map> <key>Comment</key> 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(); } |