Skip to content
Snippets Groups Projects
Commit 2d53f5ea authored by Michael Pohoreski's avatar Michael Pohoreski
Browse files

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
parents 54d4406d 46263004
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment