diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-10 20:04:47 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-10 20:04:47 +0200 |
| commit | d86c69c7380704a34b22d88511df124ca357d5c1 (patch) | |
| tree | 3bc740e62f53b29dab84622a0a8b37dcdeaeaa85 /indra/newview/llagent.cpp | |
| parent | e8610200433ef636bbd0b594afe9543cebc06689 (diff) | |
| parent | d7140c95e3a667ea5d659802956bc0aa5acfda41 (diff) | |
merge
--HG--
branch : product-engine
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 ); } |