diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-10-14 13:13:50 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-10-14 13:13:50 -0700 |
| commit | c8fdc936b4144b828bb88acf3d87cfb82a6a1c26 (patch) | |
| tree | d1417f929b280590c8ee4e76e1fa6e97c86121f2 | |
| parent | 59c45442a121a56918409fcaa6364937374014ad (diff) | |
| parent | 32e7a0d52262896c424fa77009a7f454d606322b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
| -rwxr-xr-x | indra/newview/llagent.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/main_view.xml | 2 |
4 files changed, 9 insertions, 5 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); 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; 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"> - <layout_panel mouse_opaque="false" + <layout_panel mouse_opaque="true" follows="left|right|top" name="status_bar_container" tab_stop="false" |