diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-06-22 10:14:33 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-06-22 10:14:33 +0300 |
| commit | f25da4a2c7ad7fc41d15c51524a110e5386d1e5b (patch) | |
| tree | fa874cb1966cefda551fd653180c29f5c3bb974d /indra/newview/llagentcamera.cpp | |
| parent | 525a56872f1e66651b578e59a776643352a3d523 (diff) | |
| parent | 5e5ad8582cbbe3dd656d9b3824d96a37e312a31a (diff) | |
Merge with default branch
--HG--
branch : product-engine
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(); |