diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-09-16 20:01:35 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-09-16 20:01:35 -0400 |
| commit | 5215bf9925f1cecb64b04ab8ab226b63be65227c (patch) | |
| tree | 862ecbc289eece3404ec601fa8796e2b6ac75c4b | |
| parent | fbffeea75b514e71707b9da14a503d3f50ca8b56 (diff) | |
[STORM-175] Fix Ping Interpolate Object Position
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 5892a8081d..53a7d92b86 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -645,6 +645,7 @@ Teardrops Fall Techwolf Lupindo SNOW-92 SNOW-649 + SNOW-687 SNOW-680 SNOW-681 SNOW-690 @@ -655,6 +656,7 @@ Tharax Ferraris VWR-605 Thickbrick Sleaford SNOW-207 + SNOW-390 SNOW-421 SNOW-462 SNOW-586 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 |