From 1d53e59befeea6547567b9f6e3c254846048250c Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 14 Oct 2011 12:51:42 -0700 Subject: EXP-1369 FIX Click to walk pan icon shown and action when click, holding, and dragging on top of UI chrome --- indra/newview/skins/default/xui/en/main_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml index 2c07e8e35f..4d3d431b3a 100644 --- a/indra/newview/skins/default/xui/en/main_view.xml +++ b/indra/newview/skins/default/xui/en/main_view.xml @@ -22,7 +22,7 @@ name="menu_stack" orientation="vertical" top="0"> - Date: Fri, 14 Oct 2011 13:10:02 -0700 Subject: 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 --- indra/newview/llagentcamera.cpp | 5 ++--- indra/newview/llviewermenu.cpp | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 27e9aa32f2..751b73e1eb 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2041,12 +2041,11 @@ void LLAgentCamera::resetCamera() void LLAgentCamera::changeCameraToMouselook(BOOL animate) { if (!gSavedSettings.getBOOL("EnableMouselook") - || LLViewerJoystick::getInstance()->getOverrideCamera() - || !gViewerWindow->getUIVisibility()) + || LLViewerJoystick::getInstance()->getOverrideCamera()) { return; } - + // visibility changes at end of animation gViewerWindow->getWindow()->resetBusyCount(); diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 3dd5d26b6d..cfbe32a871 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6896,6 +6896,7 @@ class LLToggleHowTo : public view_listener_t p.url = gSavedSettings.getString("HowToHelpURL"); p.show_chrome = false; p.target = "__help_how_to"; + p.show_page_title = false; LLFloaterReg::toggleInstanceOrBringToFront("how_to", p); return true; -- cgit v1.2.3 From 32e7a0d52262896c424fa77009a7f454d606322b Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Fri, 14 Oct 2011 13:10:15 -0700 Subject: 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 --- indra/newview/llagent.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); -- cgit v1.2.3