diff options
| author | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-04-30 18:00:33 +0000 |
|---|---|---|
| committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2021-04-30 18:00:33 +0000 |
| commit | 2d53f5ea859195151bb4bc4d855165ef8b6fc226 (patch) | |
| tree | 1b5c2dc41735d4aaf440b3b80f5bb9bd7cbea5e9 | |
| parent | 54d4406df7b342c0ecd5f79829ba0bb526b97d8b (diff) | |
| parent | 4626300493ade1c274b0b0a8f81e31b802eeaa6b (diff) | |
Merged in SL-14885 (pull request #529)
SL-14885 Allow mousewheel to zoom way out when user has disabled camera constraints
Approved-by: Euclid Linden
| -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 ed6c3c307f..0cf91ba3de 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2038,6 +2038,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 |