diff options
| author | simon <none@none> | 2014-06-24 10:06:28 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-06-24 10:06:28 -0700 |
| commit | 05319e6c94f7975281ed38c322f5d1e3bcd3e211 (patch) | |
| tree | 74e41a15540d61fcba82241c70a7734c8d919111 /indra/newview/llagentcamera.cpp | |
| parent | 190f66ab78e6a2df15e91e80d9863dcc8f030a2c (diff) | |
| parent | 527f180dd74d83e478d68402626ca23341cc42e6 (diff) | |
Pull downstream viewer-tiger and become version 3.7.11
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; |