From 9f682772d93b4530ad7bcbf52adb2300cd91cd4d Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 13 Oct 2011 20:45:50 -0700
Subject: [PATCH] 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
---
indra/newview/llviewerwindow.cpp | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 92dc352cf44..b8715bfa5b9 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()
--
GitLab