From 4bcf2079f15a09d40f1d7aa61b2768cc54dc427a Mon Sep 17 00:00:00 2001 From: Aura Linden <aura@lindenlab.com> Date: Mon, 9 Jun 2014 10:28:18 -0700 Subject: [PATCH] Fix for maint-3154 alt-zoom zooms way out --- indra/newview/llagentcamera.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index d1dfbe3315c..7b0496ea457 100755 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -913,6 +913,8 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction) F32 max_distance = llmin(mDrawDistance - DIST_FUDGE, LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE ); + max_distance = llmin(max_distance, current_distance * 4.f); //Scaled max relative to current distance. MAINT-3154 + if (new_distance > max_distance) { new_distance = max_distance; -- GitLab