diff options
| author | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-10-27 17:22:26 -0700 |
| commit | 6e8ffc247fe52668446b8fa1ed7f1547a755076f (patch) | |
| tree | 23b6fa5ce6bf6a32944faca54f9a18aca255fd75 /indra/newview/llagentcamera.cpp | |
| parent | 0ecc5c0878adf93e96b99e3db4c65cdb757b99fb (diff) | |
| parent | fcd1ccd21e3ea8f0944537347dd6c9d7972d50ce (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index f195c985c0..751b73e1eb 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2040,11 +2040,12 @@ void LLAgentCamera::resetCamera() //----------------------------------------------------------------------------- void LLAgentCamera::changeCameraToMouselook(BOOL animate) { - if (!gSavedSettings.getBOOL("EnableMouselook") || LLViewerJoystick::getInstance()->getOverrideCamera()) + if (!gSavedSettings.getBOOL("EnableMouselook") + || LLViewerJoystick::getInstance()->getOverrideCamera()) { return; } - + // visibility changes at end of animation gViewerWindow->getWindow()->resetBusyCount(); |