diff options
| author | Richard Linden <none@none> | 2010-12-08 16:04:07 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-12-08 16:04:07 -0800 |
| commit | ca2141ce90d484284bf57d72feb82e290958b061 (patch) | |
| tree | 0e2ea77f0b7c2a9c9f9e69c09c0be22567afac3b /indra/newview/llagentcamera.cpp | |
| parent | d9b4570883652d647c05083c18fac1a088efd6e2 (diff) | |
| parent | c28b476a6806a426593e6798ea537f13ca354fc8 (diff) | |
merge with viewer-dev
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 7c953cd2dc..15f8e7bf4d 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2041,7 +2041,7 @@ void LLAgentCamera::resetCamera() //----------------------------------------------------------------------------- void LLAgentCamera::changeCameraToMouselook(BOOL animate) { - if (LLViewerJoystick::getInstance()->getOverrideCamera()) + if (!gSavedSettings.getBOOL("EnableMouselook") || LLViewerJoystick::getInstance()->getOverrideCamera()) { return; } |