diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-19 18:45:22 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-19 18:45:22 -0700 |
| commit | eedc8687b0d05a14e41f1601d2ee615c69d132d0 (patch) | |
| tree | 0488609e24bd916bd8635d4bc6cad0383db028c4 /indra/llui/llfloater.cpp | |
| parent | 6d7ab5d1346a8c91563a83d0a5eee912d36a1488 (diff) | |
EXP-1364 FIX Debug console output covered by left toolbar buttons if present
EXP-1427 FIX Voice Settings dialog closes when selecting minimize option
Diffstat (limited to 'indra/llui/llfloater.cpp')
| -rw-r--r-- | indra/llui/llfloater.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 0749093777..bd537bfb19 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -1479,6 +1479,7 @@ BOOL LLFloater::handleMouseDown(S32 x, S32 y, MASK mask) if(offerClickToButton(x, y, mask, BUTTON_CLOSE)) return TRUE; if(offerClickToButton(x, y, mask, BUTTON_RESTORE)) return TRUE; if(offerClickToButton(x, y, mask, BUTTON_TEAR_OFF)) return TRUE; + if(offerClickToButton(x, y, mask, BUTTON_DOCK)) return TRUE; // Otherwise pass to drag handle for movement return mDragHandle->handleMouseDown(x, y, mask); @@ -1584,6 +1585,12 @@ void LLFloater::setDocked(bool docked, bool pop_on_undock) { mDocked = docked; mButtonsEnabled[BUTTON_DOCK] = !mDocked; + + if (mDocked) + { + setMinimized(FALSE); + } + updateTitleButtons(); storeDockStateControl(); |