diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2010-12-17 15:54:00 -0500 |
| commit | db11a76d519ebb076ec0b72284993d7f6c15f383 (patch) | |
| tree | 2fa7986e0e0ba9a39b2d2d3722ce1769ce6c2684 /indra/newview/llagentcamera.cpp | |
| parent | 3c05ebd28635e867f9726062b08cdbf4a7b53b22 (diff) | |
| parent | fb8ba15801f0620699fecdf2ed08668df0be7210 (diff) | |
Merge from viewer-development post 2.4 release
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; } |