livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-12241: Camera becomes uncontrollable when zooming out

Tonya Souther 2014-07-11 17:35:12 -05:00
parent 0ed8f2563f
commit 6e73080806
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llagentcamera.cpp
View File

@ -941,6 +941,11 @@ void LLAgentCamera::cameraZoomIn(const F32 fraction)
static LLCachedControl<bool> disable_constraints(gSavedSettings,"DisableCameraConstraints");
F32 max_distance = disable_constraints ? INT_MAX : llmin(mDrawDistance - DIST_FUDGE,
LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
// <FS:TS> FIRE-12241: Camera becomes uncontrollable when zooming out
// Not sure why this works, but it's LL's fix.
max_distance = llmin(max_distance, current_distance * 4.f); //Scaled max relative to current distance. MAINT-3154
// </FS:TS> FIRE-12241
if (new_distance > max_distance)
{