summaryrefslogtreecommitdiff
path: root/indra/llmessage/llcircuit.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2023-06-28 11:02:11 -0400
committerNat Goodspeed <nat@lindenlab.com>2023-06-28 11:02:11 -0400
commit726851b039b0b0e7d623970f32b6b28616a07dc8 (patch)
tree01dd9d23638486031dcc49d201c35d8338091794 /indra/llmessage/llcircuit.cpp
parente9d2f57866e7e4dcb46b21bef525eb9955691578 (diff)
parent6f8b812ecd73bf25d44445e1b791f9e1b01f429f (diff)
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
to resolve conflicts in installer_template.nsi
Diffstat (limited to 'indra/llmessage/llcircuit.cpp')
-rw-r--r--indra/llmessage/llcircuit.cpp2
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
{