diff options
| author | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-07-22 08:58:31 +0300 |
|---|---|---|
| committer | maksymsproductengine <maksymsproductengine@lindenlab.com> | 2014-07-22 08:58:31 +0300 |
| commit | 1634f0f46c9efcb187f4a819f992c24a93fe8d9c (patch) | |
| tree | 2f3f08c8976054b821eb96580923369597c5ec80 /indra/newview/llagentcamera.cpp | |
| parent | 9f5fc6efbd3f3e4418372425734372b5a9bb5d35 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
viewer-release 3.7.13 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; |