diff options
Diffstat (limited to 'indra/newview/llsyswellwindow.cpp')
| -rw-r--r-- | indra/newview/llsyswellwindow.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index c5a92f52d0..67a0528a06 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -112,9 +112,12 @@ BOOL LLSysWellWindow::postBuild() void LLSysWellWindow::setMinimized(BOOL minimize) { // we don't show empty Message Well window - setVisible(!minimize && !isWindowEmpty()); + if (!minimize) + { + setVisible(!isWindowEmpty()); + } - LLFloater::setMinimized(minimize); + LLDockableFloater::setMinimized(minimize); } //--------------------------------------------------------------------------------- @@ -264,7 +267,7 @@ void LLSysWellWindow::toggleWindow() getDockTongue(), LLDockControl::TOP, boost::bind(&LLSysWellWindow::getAllowedRect, this, _1))); } - if(!getVisible()) + if(!getVisible() || isMinimized()) { if(isWindowEmpty()) { @@ -273,7 +276,7 @@ void LLSysWellWindow::toggleWindow() setVisible(TRUE); } - else + else if (isDocked()) { setVisible(FALSE); } |