diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:33:42 -0800 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-12-02 14:33:42 -0800 |
| commit | 1e050c2ed87ae2093623fa4c66a69aeee1fb980c (patch) | |
| tree | ff9bf66608dc3b9c4459daa68ec99a3065182aac /indra/newview/llagentcamera.cpp | |
| parent | 36954908632d6f5366f6517023676c1bcd71aa17 (diff) | |
| parent | d276950c8d4d53f9d5d6497d5a4a4582c499938a (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; } |