diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-12 13:50:32 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-12 13:50:32 -0700 |
| commit | cc839191a86f9cdeea4449e6b097c0661b0da03e (patch) | |
| tree | 36abd1cfdcf218218439cf68a795ff20245ab6ec /indra/newview/llviewerwindow.cpp | |
| parent | 64ae4d14627a81dfbd6bbe25273e32bf1a1ad8b6 (diff) | |
| parent | a1f0101ca293768a37889856b1dde69110b30b7c (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 2473d41a35..665b31a427 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -4992,7 +4992,11 @@ void LLViewerWindow::setUIVisibility(bool visible) if (!visible) { - gFloaterView->closeAllChildren(false); + gFloaterView->hideAllFloaters(); + } + else + { + gFloaterView->showHiddenFloaters(); } } |