diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-18 14:30:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-18 14:30:57 -0400 |
| commit | ed7785bf97a601448ba2da5fb2f19ea2861454c5 (patch) | |
| tree | 17e8d9ccf28ae30c5029ecea7e0ab8bed0fe3926 /indra/newview/llfloatercamera.cpp | |
| parent | c8533650b4779040c5e196f9ff156e3454edc9c8 (diff) | |
| parent | bf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff) | |
merge up to 3.5.0-beta3 (chui)
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
| -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. |