diff options
| author | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-09-14 21:13:20 +0000 |
| commit | 13c391f1984bb8cb9d67a7729af2ee5714409215 (patch) | |
| tree | 112edff1d25adabb4893e6746ba76a4182865f8a /indra/newview/llagent.cpp | |
| parent | b3d807d5ff8dca6c891e9a5e0ddc7bc147d69f8c (diff) | |
EFFECTIVE MERGE: svn merge -r 68118:68999 svn+ssh://svn/svn/linden/branches/maintenance
ACTUAL MERGE: svn merge -r 69685:69687 svn+ssh://svn/svn/linden/branches/release-r69649-maintenance-sync
EQUIVALENT TO: svn merge -r 68118:69663 svn+ssh://svn/svn/linden/branches/maintenance-r68999
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 3000cce4f9..b3dac57b2a 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -1838,7 +1838,7 @@ void LLAgent::cameraOrbitIn(const F32 meters) if (new_distance > max_distance) { // Unless camera is unlocked - if (!LLViewerCamera::sDisableCameraConstraints) + if (!gSavedSettings.getBOOL("DisableCameraConstraints")) { return; } @@ -3754,7 +3754,7 @@ LLVector3d LLAgent::calcCameraPositionTargetGlobal(BOOL *hit_limit) camera_position_global = focusPosGlobal + mCameraFocusOffset; } - if (!LLViewerCamera::sDisableCameraConstraints && !gAgent.isGodlike()) + if (!gSavedSettings.getBOOL("DisableCameraConstraints") && !gAgent.isGodlike()) { LLViewerRegion* regionp = gWorldPointer->getRegionFromPosGlobal( camera_position_global); @@ -3878,7 +3878,7 @@ F32 LLAgent::getCameraMinOffGround() } else { - if (LLViewerCamera::sDisableCameraConstraints) + if (gSavedSettings.getBOOL("DisableCameraConstraints")) { return -1000.f; } |