diff options
| author | Don Kjer <don@lindenlab.com> | 2010-12-13 12:34:39 -0800 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2010-12-13 12:34:39 -0800 |
| commit | 9a322d1b7a6ee5380f8724b33a20c56c9583f093 (patch) | |
| tree | 70ee8e942f30ac3ed2f371b60cfcba9adfd961c2 /indra/newview/llagentcamera.cpp | |
| parent | f4884faf3a020a718c611f34aa534e80d8a8b666 (diff) | |
| parent | e27bcbe0d20c87556b0bcb1e3feaaea6544d3e16 (diff) | |
Merge from viewer-development
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; } |