diff options
author | Loren Shih <seraph@lindenlab.com> | 2011-01-24 10:56:40 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2011-01-24 10:56:40 -0500 |
commit | d0cba9e9194841e8867afcbd02b3792b652756ab (patch) | |
tree | 3a1016da682349dcab75b826c6a9ed002a80a6b2 /indra/llmessage/llcircuit.cpp | |
parent | 4fefb98cba6cdf5051bfd4d575dcccc468d77836 (diff) | |
parent | 7a453b7c9351a743b222bbb2b94809cf7c6b3ce8 (diff) |
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'indra/llmessage/llcircuit.cpp')
-rw-r--r-- | indra/llmessage/llcircuit.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp index 3ba2dfb104..e0410906fb 100644 --- a/indra/llmessage/llcircuit.cpp +++ b/indra/llmessage/llcircuit.cpp @@ -87,6 +87,7 @@ LLCircuitData::LLCircuitData(const LLHost &host, TPACKETID in_id, mPingDelayAveraged((F32)INITIAL_PING_VALUE_MSEC), mUnackedPacketCount(0), mUnackedPacketBytes(0), + mLastPacketInTime(0.0), mLocalEndPointID(), mPacketsOut(0), mPacketsIn(0), @@ -667,6 +668,8 @@ void LLCircuitData::checkPacketInID(TPACKETID id, BOOL receive_resent) mHighestPacketID = llmax(mHighestPacketID, id); } + // Save packet arrival time + mLastPacketInTime = LLMessageSystem::getMessageTimeSeconds(); // Have we received anything on this circuit yet? if (0 == mPacketsIn) |