diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:19:16 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-11-19 13:19:16 -0500 |
| commit | 6cea252986ef6d33f2e37333a286362b8e0272c5 (patch) | |
| tree | ec0e4d56a9dc2d8a97cc9bce4744b097f4b7efe4 /indra/newview/llsyswellwindow.cpp | |
| parent | 2b0a997b13de15c7aae009b52d7353c97e1781f3 (diff) | |
| parent | 815f336a157cc33233633deed66634195d3dc552 (diff) | |
merge
--HG--
branch : avatar-pipeline
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 2fb6550107..eada387945 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -90,9 +90,9 @@ BOOL LLSysWellWindow::postBuild() void LLSysWellWindow::setMinimized(BOOL minimize) { // we don't show empty Message Well window - if (!minimize) + if (!minimize && isWindowEmpty()) { - setVisible(!isWindowEmpty()); + return; } LLDockableFloater::setMinimized(minimize); @@ -268,8 +268,11 @@ void LLSysWellWindow::toggleWindow() { setVisible(FALSE); } - //set window in foreground - setFocus(getVisible()); + else if(!isDocked()) + { + // bring to front undocked floater + setVisible(TRUE); + } } //--------------------------------------------------------------------------------- |