diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-20 09:56:57 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-09-20 09:56:57 +0100 |
| commit | 301f0c6a3b28a3040f8cb36e73d3b367a9262724 (patch) | |
| tree | 97c37b2db9701f01f9872b58a414990bbc311de4 /indra/newview/llviewerobject.cpp | |
| parent | c2a87df2bccbf6e662f3a4c4edb210748ffa692d (diff) | |
| parent | b92ca367aed209b6e8007035ea307d5a0c8d53dc (diff) | |
merge.
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
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 |