diff options
| author | Dave Parks <davep@lindenlab.com> | 2022-11-30 13:25:25 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2022-11-30 13:25:25 -0600 |
| commit | 0186707937852922521eeced28687231d8407deb (patch) | |
| tree | d1c45591b0037d7ecb06067a3c953630245712b7 /indra/newview/llagentcamera.cpp | |
| parent | 87bb72a47a1fc64b98e498120e332de76e6a9211 (diff) | |
| parent | 0d58d3ee7a4196f31d45dd5a466a452d887a6968 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 57a59d81c4..5de52c1daf 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2043,6 +2043,13 @@ LLVector3d LLAgentCamera::getFocusOffsetInitial() F32 LLAgentCamera::getCameraMaxZoomDistance() { + // SL-14706 / SL-14885 TPV have relaxed camera constraints allowing you to mousewheeel zoom WAY out. + static LLCachedControl<bool> s_disable_camera_constraints(gSavedSettings, "DisableCameraConstraints", false); + if (s_disable_camera_constraints) + { + return (F32)INT_MAX; + } + // Ignore "DisableCameraConstraints", we don't want to be out of draw range when we focus onto objects or avatars return llmin(MAX_CAMERA_DISTANCE_FROM_OBJECT, mDrawDistance - 1, // convenience, don't hit draw limit when focusing on something |