diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:24:15 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-02 07:24:15 -0400 |
commit | a32daa0c10b285354e94e0e8bf0cc6c5ffce09a5 (patch) | |
tree | c2ba5f181935b95d2f23406c41917401cd4be963 /indra/newview/llhudeffectlookat.cpp | |
parent | 929bde3ed08f9a1d2a8f4c9821b0d51c11d895e9 (diff) | |
parent | 89216a6c213c126b8ab6dacaeb21340fa8f7a001 (diff) |
merge changes for vwr-25126
Diffstat (limited to 'indra/newview/llhudeffectlookat.cpp')
-rw-r--r-- | indra/newview/llhudeffectlookat.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llhudeffectlookat.cpp b/indra/newview/llhudeffectlookat.cpp index 72f64752d6..b380b3fe20 100644 --- a/indra/newview/llhudeffectlookat.cpp +++ b/indra/newview/llhudeffectlookat.cpp @@ -56,7 +56,7 @@ const S32 PKT_SIZE = 57; // throttle const F32 MAX_SENDS_PER_SEC = 4.f; -const F32 MIN_DELTAPOS_FOR_UPDATE = 0.05f; +const F32 MIN_DELTAPOS_FOR_UPDATE_SQUARED = 0.05f * 0.05f; const F32 MIN_TARGET_OFFSET_SQUARED = 0.0001f; @@ -416,7 +416,7 @@ BOOL LLHUDEffectLookAt::setLookAt(ELookAtType target_type, LLViewerObject *objec BOOL lookAtChanged = (target_type != mTargetType) || (object != mTargetObject); // lookat position has moved a certain amount and we haven't just sent an update - lookAtChanged = lookAtChanged || ((dist_vec(position, mLastSentOffsetGlobal) > MIN_DELTAPOS_FOR_UPDATE) && + lookAtChanged = lookAtChanged || ((dist_vec_squared(position, mLastSentOffsetGlobal) > MIN_DELTAPOS_FOR_UPDATE_SQUARED) && ((current_time - mLastSendTime) > (1.f / MAX_SENDS_PER_SEC))); if (lookAtChanged) |