From 8e3717e187766f0ad24f29886ae930be186a4394 Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 13 Oct 2011 20:31:41 -0700
Subject: [PATCH] EXP-1323 FIX Mouselook text "Press ESC to return to World
View" overlaps with bottom toolbar if mode is icon only hide toolbars in
mouselook hide top_info_bar when hiding UI disable mouselook when hiding UI
fixed layout of more button in navigation bar
---
indra/newview/llagent.cpp | 3 +++
indra/newview/llagentcamera.cpp | 4 +++-
indra/newview/llviewerwindow.cpp | 2 ++
.../skins/default/xui/en/panel_navigation_bar.xml | 10 ++++++----
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 31a73c8c317..edb536d337c 100755
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -68,6 +68,7 @@
#include "llstatusbar.h"
#include "llteleportflags.h"
#include "lltool.h"
+#include "lltoolbarview.h"
#include "lltoolpie.h"
#include "lltoolmgr.h"
#include "lltrans.h"
@@ -1862,6 +1863,7 @@ void LLAgent::endAnimationUpdateUI()
// clean up UI from mode we're leaving
if (gAgentCamera.getLastCameraMode() == CAMERA_MODE_MOUSELOOK )
{
+ gToolBarView->setToolBarsVisible(true);
// show mouse cursor
gViewerWindow->showCursor();
// show menus
@@ -1972,6 +1974,7 @@ void LLAgent::endAnimationUpdateUI()
if (gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK)
{
// hide menus
+ gToolBarView->setToolBarsVisible(false);
gMenuBarView->setVisible(FALSE);
LLNavigationBar::getInstance()->setVisible(FALSE);
gStatusBar->setVisibleForMouselook(false);
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index f195c985c08..27e9aa32f24 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -2040,7 +2040,9 @@ void LLAgentCamera::resetCamera()
//-----------------------------------------------------------------------------
void LLAgentCamera::changeCameraToMouselook(BOOL animate)
{
- if (!gSavedSettings.getBOOL("EnableMouselook") || LLViewerJoystick::getInstance()->getOverrideCamera())
+ if (!gSavedSettings.getBOOL("EnableMouselook")
+ || LLViewerJoystick::getInstance()->getOverrideCamera()
+ || !gViewerWindow->getUIVisibility())
{
return;
}
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 665b31a427e..92dc352cf44 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -4987,11 +4987,13 @@ void LLViewerWindow::setUIVisibility(bool visible)
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();
gFloaterView->hideAllFloaters();
}
else
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
index ab6fa36e6cb..7a8e872dc96 100644
--- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
+++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml
@@ -188,10 +188,12 @@
<more_button
follows="left|bottom"
name=">>"
- tab_stop="false"
- tool_tip="Show more of My Favorites"
- top="15"
- width="50">
+ tab_stop="false"
+ tool_tip="Show more of My Favorites"
+ top="13"
+ width="50"
+ bottom="0"
+ valign="bottom">
More ▼
</more_button>
</favorites_bar>
--
GitLab