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 /indra/newview/llagent.cpp | |
| parent | 59c45442a121a56918409fcaa6364937374014ad (diff) | |
| parent | 32e7a0d52262896c424fa77009a7f454d606322b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rwxr-xr-x | indra/newview/llagent.cpp | 6 |
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); |