diff options
| author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-17 09:57:38 -0700 |
|---|---|---|
| committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-09-17 09:57:38 -0700 |
| commit | 7c3a81f577307143a6d4bb5cef1606db82397cdd (patch) | |
| tree | 26c531402dbc8f1224185e7461f3b7584b558614 /indra/newview/llviewerobject.cpp | |
| parent | 0974f18da5f3b1e69191be19153925930efd6a9d (diff) | |
| parent | 27bbf79c89fb8c737b88d769b2056304aef69dc3 (diff) | |
Merge in lenny work
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 |