diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-26 06:15:49 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-26 06:15:49 +0300 |
| commit | b9cd6e2e84f9c4161f0151b9f0cee1fcb309d8d7 (patch) | |
| tree | d92a175355a53fc03d1f50a9aa4eca71787a027c /indra/llmessage | |
| parent | 74b8ca575ff7f0cfcfd443e03885542bc5b10c46 (diff) | |
| parent | 626bbe5032cab1fd2641ad02443e421567e7cce5 (diff) | |
Merge branch 'xcode-14.3' into DRTVWR-582-maint-U
# Conflicts:
# indra/llcommon/llsdserialize.h
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llcircuit.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp index 8baa2e328b..a9a292958f 100644 --- a/indra/llmessage/llcircuit.cpp +++ b/indra/llmessage/llcircuit.cpp @@ -271,7 +271,6 @@ void LLCircuitData::ackReliablePacket(TPACKETID packet_num) S32 LLCircuitData::resendUnackedPackets(const F64Seconds now) { - S32 resent_packets = 0; LLReliablePacket *packetp; @@ -375,7 +374,6 @@ S32 LLCircuitData::resendUnackedPackets(const F64Seconds now) // Don't remove it yet, it still gets to try to resend at least once. ++iter; } - resent_packets++; } else { |