diff options
| author | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-31 19:25:42 +0200 |
|---|---|---|
| committer | maxim@mnikolenko <maxim@mnikolenko> | 2013-01-31 19:25:42 +0200 |
| commit | 2ec0d24e4a0beac5afba992b37f97c30d972342b (patch) | |
| tree | 55842c2c5238b75a70eb99c3356fe99196530dc7 /indra/newview/llfloatercamera.cpp | |
| parent | 8714b610149a5ae7b6f248023722f237c9336472 (diff) | |
| parent | 22835e1ddb39341df26681dde8d22c673cc3940b (diff) | |
Merge
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. |