diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 12:20:24 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2010-06-21 12:20:24 -0400 |
| commit | f17623d8c67a10c2d7547e40ac8442c703d107ed (patch) | |
| tree | 2ae37385da280a758a66e920f9bdb317dcde59ee /indra/newview/llagentcamera.cpp | |
| parent | 4e538adca41d486125c3b887ce694c457bcab157 (diff) | |
| parent | bef22c0325cbfeb3d290753a66ecf862bf4593d3 (diff) | |
Automated merge with ssh://192.168.2.107/c:/linden/viewer-release/
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index c6ca9c5e3a..9cf0a659c1 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2084,6 +2084,9 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate) // visibility changes at end of animation gViewerWindow->getWindow()->resetBusyCount(); + // Menus should not remain open on switching to mouselook... + LLMenuGL::sMenuContainer->hideMenus(); + // unpause avatar animation gAgent.unpauseAnimation(); |