diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-13 20:34:55 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-13 20:34:55 -0500 |
| commit | cd9c5e5d7062277d34653e19429c2bf3774f9ac9 (patch) | |
| tree | 52873a33ea923e135da1e4e7918320d459ee4dad /indra/newview/llviewerwindow.cpp | |
| parent | 99dcd4f4939087c3b2aea9d09e13d374de9ce137 (diff) | |
| parent | 6f52f1e502cf030ceb4e14963fdda1021ea33023 (diff) | |
merging avatar-pipeline branch into viewer-2-0
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(); |