diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-17 17:58:17 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-17 17:58:17 -0500 |
| commit | 32178873564f86f0ab9ee06d485486fc9d609012 (patch) | |
| tree | 4beae7908cbdd5e6af5241682110ac958b7c56ae /indra/newview/llsyswellwindow.cpp | |
| parent | 064fb26092ac9f73f9d0301f1e214e27e8418839 (diff) | |
| parent | 2365dbcd459b37942ddacbcb7010232113a126c1 (diff) | |
Merge of viewer2 into avp
--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); + } } //--------------------------------------------------------------------------------- |