diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:55:33 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-02-09 15:55:33 -0800 |
| commit | f040942f190cfdf10ee577a9b4f6a5c83e752e00 (patch) | |
| tree | e500ffe44696621292f37f2ace41c54a0331f9ee /indra/newview/llagent.cpp | |
| parent | 91b2ff00ae874f938919373c0db3de0721c7bf25 (diff) | |
EXT-4449 [BSI] Zoom In does not function properly on large or linked prim sets
reviewed by Richard CC#99
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 2354323a66..a061744f7c 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4482,7 +4482,9 @@ void LLAgent::setCameraPosAndFocusGlobal(const LLVector3d& camera_pos, const LLV { const F64 ANIM_METERS_PER_SECOND = 10.0; const F64 MIN_ANIM_SECONDS = 0.5; + const F64 MAX_ANIM_SECONDS = 10.0; F64 anim_duration = llmax( MIN_ANIM_SECONDS, sqrt(focus_delta_squared) / ANIM_METERS_PER_SECOND ); + anim_duration = llmin( anim_duration, MAX_ANIM_SECONDS ); setAnimationDuration( (F32)anim_duration ); } |