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/lldockablefloater.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/lldockablefloater.cpp')
| -rw-r--r-- | indra/llui/lldockablefloater.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/lldockablefloater.cpp b/indra/llui/lldockablefloater.cpp index ca2dc644a4..aea58be12a 100644 --- a/indra/llui/lldockablefloater.cpp +++ b/indra/llui/lldockablefloater.cpp @@ -162,10 +162,15 @@ void LLDockableFloater::setVisible(BOOL visible) void LLDockableFloater::setMinimized(BOOL minimize) { - if(minimize) + if(minimize && isDocked()) { + // minimizing a docked floater just hides it setVisible(FALSE); } + else + { + LLFloater::setMinimized(minimize); + } } LLView * LLDockableFloater::getDockWidget() |