summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2011-10-14 13:10:15 -0700
committerRichard Nelson <richard@lindenlab.com>2011-10-14 13:10:15 -0700
commit32e7a0d52262896c424fa77009a7f454d606322b (patch)
tree94bfbf6c069c1abb4c43f2888d650c9f05c66a5a
parent0d215ba34fa479bd1a9c0b589c2f1e42448dfe63 (diff)
EXP-1323 FIX Mouselook text "Press ESC to return to World View" overlaps with bottom toolbar if mode is icon only
made mouselook work when hiding ui by unhiding UI first
-rwxr-xr-xindra/newview/llagent.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index edb536d337..5fc95f123a 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -1973,7 +1973,11 @@ void LLAgent::endAnimationUpdateUI()
//---------------------------------------------------------------------
if (gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK)
{
- // hide menus
+ // clean up UI
+ // first show anything hidden by UI toggle
+ gViewerWindow->setUIVisibility(TRUE);
+
+ // then hide stuff we want hidden for mouselook
gToolBarView->setToolBarsVisible(false);
gMenuBarView->setVisible(FALSE);
LLNavigationBar::getInstance()->setVisible(FALSE);