diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2011-10-20 15:28:52 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2011-10-20 15:28:52 -0700 |
| commit | 54118511c04323c5ae5d43a9d7f7b8639531d541 (patch) | |
| tree | 8b6a9061593a53e3c9d83d9c28877447e28569ac /indra/llui/lldockablefloater.cpp | |
| parent | ecdd689e23cbe4b509fb885107b96b455739a497 (diff) | |
| parent | 6998c5ebc7aad43d44f1bb6e42e20503c2ff144f (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() |