From 1c4a3e2ef307afc02fac0fb21678cc5e8f7cc77d Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Thu, 9 Aug 2012 17:54:33 +0300 Subject: MAINT-1118 FIXED Change panel mode before closing floater --- indra/newview/llfloatercamera.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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. -- cgit v1.2.3