summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-10-12 18:13:01 -0700
committerMerov Linden <merov@lindenlab.com>2011-10-12 18:13:01 -0700
commit40ebe180a6592381804555d1c9e8df84bf35345a (patch)
tree523d687dedb2921d30e1d553184a8caa87ee3c45 /indra/newview/llviewerwindow.cpp
parentaa1f0215c764fa346625ace43c467a0e0f803057 (diff)
parent1181e7c75747361e1a57f083cf82c63ef152bfc5 (diff)
Pull from richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
-rw-r--r--indra/newview/llviewerwindow.cpp6
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();
}
}