summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerwindow.cpp
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-10-12 17:50:03 -0700
committerLeslie Linden <leslie@lindenlab.com>2011-10-12 17:50:03 -0700
commit1181e7c75747361e1a57f083cf82c63ef152bfc5 (patch)
tree03d41962e61ccbbe40d3dac843a0bfe74a81a3b4 /indra/newview/llviewerwindow.cpp
parent20358ea89dc9823ac0b539030fdf03268dbdf4e9 (diff)
parent3e55263e33fde4ab1ff19e8cfcb55125ee42b70d (diff)
Merge
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();
}
}