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/llagentcamera.cpp | |
| parent | 59c45442a121a56918409fcaa6364937374014ad (diff) | |
| parent | 32e7a0d52262896c424fa77009a7f454d606322b (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 27e9aa32f2..751b73e1eb 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2041,12 +2041,11 @@ void LLAgentCamera::resetCamera() void LLAgentCamera::changeCameraToMouselook(BOOL animate) { if (!gSavedSettings.getBOOL("EnableMouselook") - || LLViewerJoystick::getInstance()->getOverrideCamera() - || !gViewerWindow->getUIVisibility()) + || LLViewerJoystick::getInstance()->getOverrideCamera()) { return; } - + // visibility changes at end of animation gViewerWindow->getWindow()->resetBusyCount(); |