diff options
author | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
---|---|---|
committer | Northspring <pantera.polnocy@phoenixviewer.com> | 2015-04-15 00:23:36 +0200 |
commit | 49630f6bf56db8b2561d99cd71cfcf2b7bee9f90 (patch) | |
tree | 2b44d1dde9392cf2e5eaa9cb60d2033f0d9bc355 /indra/llmessage/message.cpp | |
parent | 079ad3b5767c444a29f97ca2e6b27fdb28f4b116 (diff) | |
parent | a647b8f1cbab13f07ea889c80df28414bc906129 (diff) |
Merge
Diffstat (limited to 'indra/llmessage/message.cpp')
-rwxr-xr-x | indra/llmessage/message.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp index cc2d5d66ad..3d81bf31d5 100755 --- a/indra/llmessage/message.cpp +++ b/indra/llmessage/message.cpp @@ -787,7 +787,7 @@ S32 LLMessageSystem::getReceiveBytes() const } -void LLMessageSystem::processAcks() +void LLMessageSystem::processAcks(F32 collect_time) { F64Seconds mt_sec = getMessageTimeSeconds(); { @@ -813,7 +813,7 @@ void LLMessageSystem::processAcks() mCircuitInfo.resendUnackedPackets(mUnackedListDepth, mUnackedListSize); //cycle through ack list for each host we need to send acks to - mCircuitInfo.sendAcks(); + mCircuitInfo.sendAcks(collect_time); if (!mDenyTrustedCircuitSet.empty()) { |