diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-07-21 13:26:48 -0700 |
| commit | c25105945a9d74e331cae4d827fc3be8d8915b7a (patch) | |
| tree | 894c4f663fecc5659e2e1afbe7a815fd0b921f4f /indra/newview/llagentcamera.cpp | |
| parent | f5c7d69317af103b5f5f762d7e0adb82f12a71b3 (diff) | |
| parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) | |
Merge with head of viewer-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; |