summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2017-10-23 22:06:46 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2017-10-23 22:06:46 +0300
commitfbb5e8b68c8d1275df2dc670645ad293de65279a (patch)
tree8f53669dfdd3bd7b307347a54f8410c02137a040 /indra
parent76c7eb73109189871044ff7b19235af33d205bd3 (diff)
MAINT-5261 The "Ping Interpolate the object position" seems to no longer work
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llviewerobject.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 978a398986..5de4029542 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;
}