diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-10 16:09:42 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-10 16:09:42 -0500 |
| commit | cc8b983398b66253d9331f3b9d6055f8b00998b9 (patch) | |
| tree | 2c901fc33f6a390ef5b15c0446365b70074bbfa1 /indra/newview/llagent.cpp | |
| parent | 662ce9b1fd6fcdf817e8fd825ce2c35e4fa52ca3 (diff) | |
| parent | da3ad612dffa422deabc5cc9afb775442f13bb45 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 2354323a66..59f61dfdfb 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -956,6 +956,7 @@ void LLAgent::sendMessage() if (!mRegionp) { llerrs << "No region for agent yet!" << llendl; + return; } gMessageSystem->sendMessage(mRegionp->getHost()); } @@ -4482,7 +4483,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 ); } |