diff options
| author | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 09:03:05 -0800 |
|---|---|---|
| committer | Steve Bennetts <steve@lindenlab.com> | 2009-11-16 09:03:05 -0800 |
| commit | be666bc14f7252b5cfa0b9c2e34f170f5e24c4d3 (patch) | |
| tree | 282683cfddf5c624a72cd3f21cd66f18818cba77 /indra/newview/llsyswellwindow.cpp | |
| parent | 211529eee9a4cbb36961af75e94af73da920d08d (diff) | |
| parent | aba8b04cfc6763ee565a5ae9929e8be044272b08 (diff) | |
merge from product-engine
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); + } } //--------------------------------------------------------------------------------- |