diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-13 14:57:06 -0500 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2009-11-13 14:57:06 -0500 |
| commit | 2aa9f1bcbe0c51f9de24d52a08726dc13038f5b8 (patch) | |
| tree | 4cd149cf03e499c7f1c5adefe3675dce6f5872dd /indra | |
| parent | d065a185e081e7684d97bf814643f94ac191069a (diff) | |
EXT-2477 minimizing while in appearance editing mode leaves a bad state
when minimizing the viewer while in appearance editing mode with unsaved changes
kicks you out of appearance editing mode and leaves you unable to recover as
the editor always starts itself on the shape tab. Fixed this in two ways:
1) if a wearable is dirty when the editor is opened, that is the tab that is
selected.
2) the camera mode is not forcibly changed away from appearance editing mode
on minimize. This only needs to happen if we are in mouselook.
Code reviewed by Vir.
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra')
| -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(); |