diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:36:12 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:36:12 -0800 |
| commit | 7365ee2d9d79813b6f515d333b63210d583038b5 (patch) | |
| tree | bd237c8141a0b5643038640f4bc24d1fb6d5fd65 /indra/newview/llagentcamera.cpp | |
| parent | 049b00a6f10d50609055810b0800f49476b351d2 (diff) | |
| parent | ab100825bd0064dc64b9ef8bea1c70bc04090716 (diff) | |
merge
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; } |