diff options
| author | Richard Nelson <none@none> | 2010-10-04 11:21:59 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-10-04 11:21:59 -0700 |
| commit | cb76ab973d770f9e8ef81c92d09246de74573541 (patch) | |
| tree | c25d869b631f3bf1aa8a156fa196377a2e798d30 /indra/newview/llagentcamera.cpp | |
| parent | 94fbf6805435f98c09a132c807fe3a13aa882b54 (diff) | |
| parent | 033c45f99024dd8197a94936443f67f3e76d40bb (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 68e408d3e4..e7fee26dc5 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2038,7 +2038,7 @@ void LLAgentCamera::resetCamera() //----------------------------------------------------------------------------- void LLAgentCamera::changeCameraToMouselook(BOOL animate) { - if (LLViewerJoystick::getInstance()->getOverrideCamera()) + if (!gSavedSettings.getBOOL("EnableMouselook") || LLViewerJoystick::getInstance()->getOverrideCamera()) { return; } |