diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2012-08-09 17:54:33 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2012-08-09 17:54:33 +0300 |
| commit | 1c4a3e2ef307afc02fac0fb21678cc5e8f7cc77d (patch) | |
| tree | a200c16099de4b22d935d61ef4a994a54ab9bb26 /indra | |
| parent | 1408a0831bf7c713052e0b73f4c5e8a3deddd9d2 (diff) | |
MAINT-1118 FIXED Change panel mode before closing floater
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llfloatercamera.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index 21b58d3e3d..c85d048c5a 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -330,6 +330,10 @@ void LLFloaterCamera::onClose(bool app_quitting) //We don't care of camera mode if app is quitting if(app_quitting) return; + // It is necessary to reset mCurrMode to CAMERA_CTRL_MODE_PAN so + // to avoid seeing an empty floater when reopening the control. + if (mCurrMode == CAMERA_CTRL_MODE_FREE_CAMERA) + mCurrMode = CAMERA_CTRL_MODE_PAN; // When mCurrMode is in CAMERA_CTRL_MODE_PAN // switchMode won't modify mPrevMode, so force it here. // It is needed to correctly return to previous mode on open, see EXT-2727. |