livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
meow-7.2.2
Michael Pohoreski 2021-04-30 18:00:33 +00:00
parent 54d4406df7 4626300493
commit 2d53f5ea85
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llagentcamera.cpp
View File

@ -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