summaryrefslogtreecommitdiff
path: root/indra/newview/llagentcamera.cpp
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-10-04 11:21:15 -0700
committerRichard Nelson <none@none>2010-10-04 11:21:15 -0700
commit033c45f99024dd8197a94936443f67f3e76d40bb (patch)
tree8a65b6e74ce8e655cbfe1bdcb9102f6c15a9c9b9 /indra/newview/llagentcamera.cpp
parentf61ec17a6554f2c94f76258c9e3a86c7eda495d0 (diff)
EXP-142 FIXED Disable mouselook in Skylight
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
-rw-r--r--indra/newview/llagentcamera.cpp2
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;
}