diff options
| author | Cho <cho@lindenlab.com> | 2014-08-20 01:11:55 +0100 |
|---|---|---|
| committer | Cho <cho@lindenlab.com> | 2014-08-20 01:11:55 +0100 |
| commit | d071aeb6f1ff0d98e27e93391f004d6ff947e3b1 (patch) | |
| tree | faa6d458733c4f6288974ab370d7f480ed73a17c /indra/newview/llagentcamera.cpp | |
| parent | 89eac2548a9b66d8bab27a7e8d7d1ed2159e9515 (diff) | |
| parent | d576e66210c020a8a86bcc88898a352bc0875d9a (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; |