diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-12 12:05:51 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-12 12:05:51 -0800 |
| commit | 426aca61d3c00d57d7066fb1ca5a7be8d138542e (patch) | |
| tree | 8ab65d462f97bbd3ab5104c8b4d3ea497866e77a /indra/llui/lldockablefloater.cpp | |
| parent | c61cb61ecc6beca1560a93cdad4ed1bc055c57f9 (diff) | |
| parent | 01d462482189abe18a52c293315ab536287b599a (diff) | |
Merge
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 57baf28dab..a94f0206a6 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -223,10 +223,10 @@ void LLDockableFloater::draw() LLFloater::draw(); } -void LLDockableFloater::setDockControl(LLDockControl* dockControl) +void LLDockableFloater::setDockControl(LLDockControl* dockControl, bool docked /* = true */) { mDockControl.reset(dockControl); - setDocked(mDockControl.get() != NULL && mDockControl.get()->isDockVisible()); + setDocked(docked && mDockControl.get() != NULL && mDockControl.get()->isDockVisible()); } const LLUIImagePtr& LLDockableFloater::getDockTongue() |