diff options
| author | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-24 12:43:27 +0200 |
|---|---|---|
| committer | Alexei Arabadji <aarabadji@productengine.com> | 2010-02-24 12:43:27 +0200 |
| commit | d7945e5d31f3cf8da0e21d417ad07459b12e8711 (patch) | |
| tree | 3e382ecde462fa481fd590920a0d0168368b07d1 /indra/llui/lldockablefloater.cpp | |
| parent | 1d45b1edcd3570b27622c0e99cf0bd5aee331cc1 (diff) | |
implemented EXT-4641 “[BSI] Undocked camera and movement floaters position should persist across the sessions”,
made move and camera floaters save dock state;
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 0492ab0f25..3d8670fef2 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -202,10 +202,6 @@ void LLDockableFloater::setDocked(bool docked, bool pop_on_undock) translate(0, UNDOCK_LEAP_HEIGHT); } } - else - { - docked = false; - } LLFloater::setDocked(docked, pop_on_undock); } @@ -223,10 +219,10 @@ void LLDockableFloater::draw() LLFloater::draw(); } -void LLDockableFloater::setDockControl(LLDockControl* dockControl, bool docked /* = true */) +void LLDockableFloater::setDockControl(LLDockControl* dockControl) { mDockControl.reset(dockControl); - setDocked(docked && mDockControl.get() != NULL && mDockControl.get()->isDockVisible()); + setDocked(isDocked()); } const LLUIImagePtr& LLDockableFloater::getDockTongue() |