diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-19 17:22:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-19 17:22:12 -0700 |
| commit | d603085c0332f5d615cc6583e13ed0aa5ab21908 (patch) | |
| tree | bac8d5e6b99643448579060d38a2e69fab65caf7 /indra/newview/llagentcamera.cpp | |
| parent | 474457ea7ea1bd178682788426a4cf40c3fffdcd (diff) | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
Merge with dessie/viewer-release
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index ec3c7452e5..1ef9e34f87 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2065,6 +2065,7 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate) // Menus should not remain open on switching to mouselook... LLMenuGL::sMenuContainer->hideMenus(); + LLUI::clearPopups(); // unpause avatar animation gAgent.unpauseAnimation(); @@ -2310,6 +2311,7 @@ void LLAgentCamera::changeCameraToCustomizeAvatar() setAnimationDuration(turn_motion->getDuration() + CUSTOMIZE_AVATAR_CAMERA_ANIM_SLOP); } + gAgentAvatarp->invalidateAll(); gAgentAvatarp->updateMeshTextures(); } } |