diff options
| author | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
|---|---|---|
| committer | skolb <none@none> | 2009-10-23 15:34:15 -0700 |
| commit | 2b69cb9e9cf5209a8156580b74e6662e4cc4243f (patch) | |
| tree | f38805b6ca5b60e8c0130259865dc610eaee7a0b /indra/llui/lldockablefloater.cpp | |
| parent | 913786a62b2b8d8e6d9c483ea805a21e694fd818 (diff) | |
| parent | 4ddaa866dde7a92e56617a32464e0667de3759ef (diff) | |
Merged change to auto play pref (DEV-41787)
Diffstat (limited to 'indra/llui/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index 35b3e486af..f56cb2eee7 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -136,7 +136,15 @@ void LLDockableFloater::setMinimized(BOOL minimize) { setVisible(FALSE); } - setCanDock(!minimize); + + if (minimize) + { + setCanDock(false); + } + else if (!minimize && mDockControl.get() != NULL && mDockControl.get()->isDockVisible()) + { + setCanDock(true); + } LLFloater::setMinimized(minimize); } @@ -158,7 +166,10 @@ void LLDockableFloater::onDockHidden() void LLDockableFloater::onDockShown() { - setCanDock(TRUE); + if (!isMinimized()) + { + setCanDock(TRUE); + } } void LLDockableFloater::setDocked(bool docked, bool pop_on_undock) |