diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-27 14:52:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-27 14:52:17 -0400 |
| commit | 1e70d53b198e15a85138a8f0ebdf6f77f070f916 (patch) | |
| tree | 49d58bf6cd6584834b6e91688ad8bfb34bd38cff /indra/llui/lldockablefloater.cpp | |
| parent | 0c84957d312bc3dc31fdb5711317157df73b72e6 (diff) | |
| parent | 1b173ed82b65c7bb5f5d5294847a721b64f8cf35 (diff) | |
merge
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() |