summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2011-10-13 20:45:50 -0700
committerRichard Linden <none@none>2011-10-13 20:45:50 -0700
commit9f682772d93b4530ad7bcbf52adb2300cd91cd4d (patch)
tree04fc208ec9199aa1563c940f23094c59f737013e /indra
parent8e3717e187766f0ad24f29886ae930be186a4394 (diff)
EXP-1323 FIX Mouselook text "Press ESC to return to World View" overlaps with bottom toolbar if mode is icon only
fixed popping out of mouselook when turning off UI
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerwindow.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 92dc352cf4..b8715bfa5b 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4982,24 +4982,24 @@ void LLViewerWindow::setUIVisibility(bool visible)
{
mUIVisible = visible;
- if (gToolBarView)
- {
- gToolBarView->setToolBarsVisible(visible);
- }
-
- mRootView->getChildView("topinfo_bar_container")->setVisible(visible);
- mRootView->getChildView("nav_bar_container")->setVisible(visible);
- mRootView->getChildView("status_bar_container")->setVisible(visible);
-
if (!visible)
{
- gAgentCamera.changeCameraToDefault();
+ gAgentCamera.changeCameraToThirdPerson(FALSE);
gFloaterView->hideAllFloaters();
}
else
{
gFloaterView->showHiddenFloaters();
}
+
+ if (gToolBarView)
+ {
+ gToolBarView->setToolBarsVisible(visible);
+ }
+
+ mRootView->getChildView("topinfo_bar_container")->setVisible(visible);
+ mRootView->getChildView("nav_bar_container")->setVisible(visible);
+ mRootView->getChildView("status_bar_container")->setVisible(visible);
}
bool LLViewerWindow::getUIVisibility()