diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-06-30 07:37:29 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-06-30 07:37:29 +0800 |
| commit | 3c5f4d1273e02c9d247ff86d6cef20c37e587f19 (patch) | |
| tree | e78cdf529cd6cc3b7657482048f7e577eb6f1e47 /indra/newview/llagentcamera.cpp | |
| parent | 095bf053f148dac958158f6709303bf09fbcd719 (diff) | |
| parent | 2e16d1b365e465c0c3e505770e213200ec25fc12 (diff) | |
Merge remote-tracking branch 'mobserveur/main'
Diffstat (limited to 'indra/newview/llagentcamera.cpp')
| -rw-r--r-- | indra/newview/llagentcamera.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index 1912d9d1d5..8e8d7e6c50 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -2663,9 +2663,9 @@ void LLAgentCamera::setCameraPosAndFocusGlobal(const LLVector3d& camera_pos, con if (mCameraAnimating) { - const F64 ANIM_METERS_PER_SECOND = 10.0; + const F64 ANIM_METERS_PER_SECOND = 15.0; const F64 MIN_ANIM_SECONDS = 0.5; - const F64 MAX_ANIM_SECONDS = 10.0; + const F64 MAX_ANIM_SECONDS = 3.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 ); |