diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-09-20 14:02:24 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-09-20 14:02:24 -0400 |
| commit | 80a33895dc715c86dbeef09f19819d981355d9bd (patch) | |
| tree | 0b3943de31941e37f6021f5c53dcc15d3fcc6ab4 /indra/newview/llviewerobject.cpp | |
| parent | b4e0c28103fe30480650bbf39b48af2a8428c74b (diff) | |
| parent | 85f69fbd8620c98f67a39e9ac09c9946c87251d8 (diff) | |
Automated merge from viewer-development-shining
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 |