diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-13 16:21:11 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-13 16:21:11 -0500 |
| commit | 7a1e7dd69d8c3c5f302c95ee083155fe0863a0be (patch) | |
| tree | bfd26599f4c25af43c0a8d6c8050d203f4a41c2d /indra/newview/llviewerwindow.cpp | |
| parent | f0cd44a6a2c4001111e82425cf2bd4fee63fad27 (diff) | |
| parent | 2aa9f1bcbe0c51f9de24d52a08726dc13038f5b8 (diff) | |
merge
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 1054223dcf..90a79698f6 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1015,7 +1015,10 @@ BOOL LLViewerWindow::handleActivate(LLWindow *window, BOOL activated) } // SL-53351: Make sure we're not in mouselook when minimised, to prevent control issues - gAgent.changeCameraToDefault(); + if (gAgent.getCameraMode() == CAMERA_MODE_MOUSELOOK) + { + gAgent.changeCameraToDefault(); + } send_agent_pause(); |