diff options
| author | Richard Linden <none@none> | 2011-10-13 20:31:41 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-13 20:31:41 -0700 |
| commit | 8e3717e187766f0ad24f29886ae930be186a4394 (patch) | |
| tree | 6eae9bc20ba436e4cbc965c4a9265880f4ce5409 /indra/newview/llagent.cpp | |
| parent | 706aa7078276fbeaaaa51b57cd229714277438f7 (diff) | |
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
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 31a73c8c31..edb536d337 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); |