diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:47:55 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:47:55 +0000 |
| commit | 2c1aacf814142b23049eff2a691a7cd2902bcf1d (patch) | |
| tree | 21d9890a07996bfa983a094f1003b6f8a0277332 /indra/newview/llfloatercamera.cpp | |
| parent | 044557a853ba70bfa80392b48936523528abda5f (diff) | |
Merging revisions 2102-2104 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1609 EXT-1255 EXT-1299
Diffstat (limited to 'indra/newview/llfloatercamera.cpp')
| -rw-r--r-- | indra/newview/llfloatercamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index 551853592b..fc661772a6 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -133,7 +133,7 @@ void LLFloaterCamera::onClose(bool app_quitting) } LLFloaterCamera::LLFloaterCamera(const LLSD& val) -: LLDockableFloater(NULL, val), +: LLTransientDockableFloater(NULL, true, val), mCurrMode(CAMERA_CTRL_MODE_ORBIT), mPrevMode(CAMERA_CTRL_MODE_ORBIT) { @@ -292,7 +292,7 @@ void LLFloaterCamera::updateState() //-------------LLFloaterCameraPresets------------------------ LLFloaterCameraPresets::LLFloaterCameraPresets(const LLSD& key): -LLDockableFloater(NULL, key) +LLTransientDockableFloater(NULL, true, key) {} BOOL LLFloaterCameraPresets::postBuild() |