summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-06-19 16:36:48 -0700
committerAura Linden <aura@lindenlab.com>2014-06-19 16:36:48 -0700
commit246d501440deaec8831d68890bc0d708e654dda8 (patch)
treef0db2549414ddd82b4f72ce800a4532b2029312a /indra
parent592024b5805a116c9d0bef893127427df0741b41 (diff)
parenta4d60d6721c62511ba7a26352e3b5d35cd0dbb94 (diff)
Pulled fix for MAINT-3154
Diffstat (limited to 'indra')
-rwxr-xr-xindra/newview/llagentcamera.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index d1dfbe3315..7b0496ea45 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;