diff options
| author | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
|---|---|---|
| committer | Rider Linden <none@none> | 2015-04-15 11:54:18 -0700 |
| commit | 109e2db131514de43a2d61da1cc4ee78dc89f858 (patch) | |
| tree | 217ca4b42ee516dab39198661e2bc91514a5a8e5 /indra/llmessage/message.cpp | |
| parent | 176d8cd268611e28c07a462df3027f4872456e5a (diff) | |
| parent | 82ae214f6a367e17dd335e80e2444cf672108821 (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 0c3c14969b..e9ce94ab3b 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()) { |