diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-07-09 14:32:46 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-07-09 14:32:46 -0400 |
| commit | ff3827f278d2d53f565bc585edc4db5bc5e5dc38 (patch) | |
| tree | 87ba73e79aeb4af20816755f4226acdb942280c6 /indra/newview/llagentcamera.cpp | |
| parent | bfb9fc85b9c8b59d5cddced665d8be2e6907b455 (diff) | |
| parent | 3e6698073cedc8b24068147cf6b7091f081ea125 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -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; |