diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-22 06:46:26 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-22 06:46:26 -0400 |
| commit | 23f05269535d7c36806913244de419d7ab0b9f46 (patch) | |
| tree | 34c996678f96d1b0ad69cc64dbe39454dc516d69 /indra/llui/lldockablefloater.cpp | |
| parent | 2a206cff7982db662c58436f870c6383b396d7df (diff) | |
| parent | f5197b6158bf1b9350fab2dd7877f6c0a4c2f778 (diff) | |
merge changes for STORM-1661
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() |