diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-24 14:22:08 -0500 |
| commit | de83bd5c6b1e103993ba74321d600f1c413785ce (patch) | |
| tree | 7a93bec47e33227541abda9ea80b7b094c8be549 /indra/llmessage/llcircuit.cpp | |
| parent | f57aa3e83f1b4286b1d6b5cc8bca20fb924cb002 (diff) | |
| parent | 295536ae98cb88bfa551ac73ae2e19a8c2ddfc88 (diff) | |
merge changes for beta fixes
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) |