diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-11-30 11:42:49 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-11-30 11:42:49 -0800 |
| commit | 1df10afa2a7802763330475e1a90547c3cff7c06 (patch) | |
| tree | 8a8cdb8c02f1e18e8cfacefc1efbc2ab43c6157e /indra/newview/llviewerobject.cpp | |
| parent | d7dd10b88bc3fda88f6528ecc5936e4889f019f3 (diff) | |
| parent | e3a2c5e3217ae74a0277f2e6d4e1e708fe398a1c (diff) | |
Merge
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index f15c6d26ec..6c2d4d7fea 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2214,7 +2214,9 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys, LLCircuitData *cdp = gMessageSystem->mCircuitInfo.findCircuit(mesgsys->getSender()); if (cdp) { - F32 ping_delay = 0.5f * time_dilation * ( ((F32)cdp->getPingDelay().valueInUnits<LLUnits::Seconds>()) + gFrameDTClamped); + // Note: delay is U32 and usually less then second, + // converting it into seconds with valueInUnits will result in 0 + F32 ping_delay = 0.5f * time_dilation * ( ((F32)cdp->getPingDelay().value()) * 0.001f + gFrameDTClamped); LLVector3 diff = getVelocity() * ping_delay; new_pos_parent += diff; } |