summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-09-16 20:01:35 -0400
committerOz Linden <oz@lindenlab.com>2010-09-16 20:01:35 -0400
commit5215bf9925f1cecb64b04ab8ab226b63be65227c (patch)
tree862ecbc289eece3404ec601fa8796e2b6ac75c4b /indra
parentfbffeea75b514e71707b9da14a503d3f50ca8b56 (diff)
[STORM-175] Fix Ping Interpolate Object Position
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerobject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 25cc24da95..741a9e6ec4 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -1844,7 +1844,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
if (cdp)
{
F32 ping_delay = 0.5f * mTimeDilation * ( ((F32)cdp->getPingDelay()) * 0.001f + gFrameDTClamped);
- LLVector3 diff = getVelocity() * (0.5f*mTimeDilation*(gFrameDTClamped + ((F32)ping_delay)*0.001f));
+ LLVector3 diff = getVelocity() * ping_delay;
new_pos_parent += diff;
}
else