diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:35:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-10-25 09:35:17 -0400 |
| commit | 012a0953b56d8313c6c0f71444f115de1aeeb7e1 (patch) | |
| tree | 59fece92dfa8895d852e997b884ace46b9e1b3a9 /indra/llui/lldockablefloater.cpp | |
| parent | 7c08ddb3f748d2173948335fd799879e3d58d81c (diff) | |
| parent | b7a349f231977d5917b29faacca143a85d925576 (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() |