diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2021-04-13 13:12:44 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2021-04-30 08:57:48 -0700 |
| commit | d1875c4932ea83decf871a7fccf871fcfe4d01ea (patch) | |
| tree | 40b77f2c39f7248745dc758b0d9716771bf78edb | |
| parent | 54d4406df7b342c0ecd5f79829ba0bb526b97d8b (diff) | |
SL-14885 Allow mousewheel to zoom way out when user has disabled camera constraints
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index ed6c3c307f..86d2b0fc6c 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2038,6 +2038,12 @@ LLVector3d LLAgentCamera::getFocusOffsetInitial() F32 LLAgentCamera::getCameraMaxZoomDistance() { + // SL-14706 / SL-14885 TPV have relaxed camera constraints allowing you to mousewheeel zoom WAY out. + if (gSavedSettings.getBOOL("DisableCameraConstraints")) + { + 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 |