diff options
| author | Aura Linden <aura@lindenlab.com> | 2014-07-22 18:23:48 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2014-07-22 18:23:48 -0700 |
| commit | f61671aec7a15160f906650b4c7449be68c7b074 (patch) | |
| tree | 1c8f08f04d137f41c5b8cbf9a579161ff0dd3538 /indra/newview/llagentcamera.cpp | |
| parent | 3d4acb535d75c4cc78c93dee318bcffaca691237 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Merged in release.
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; |