diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-06-09 10:28:18 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-06-09 10:28:18 -0700 |
| commit | 4bcf2079f15a09d40f1d7aa61b2768cc54dc427a (patch) | |
| tree | a4e4dcb5223f9805844863f727d185b673621819 /indra | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
Fix for maint-3154 alt-zoom zooms way out
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/llagentcamera.cpp | 2 |
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; |