diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-08-16 08:25:50 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-08-16 08:25:50 -0400 |
| commit | 6cf6f81ae865d4e15b715a93408c7970b6936ce8 (patch) | |
| tree | c8232f05b4fb6ae8551d44d11517e89454be55ef /indra/llmessage | |
| parent | 5430efbb31cfc0f57eac7fd130bb43aafa85143a (diff) | |
| parent | 48aecb5c8d10926caa62feb94231c3019162836a (diff) | |
DRTVWR-588: Merge branch 'fix-monterey' into DRTVWR-588-monterey
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llcircuit.cpp | 2 | ||||
| -rwxr-xr-x | indra/llmessage/tests/test_llsdmessage_peer.py | 4 |
2 files changed, 2 insertions, 4 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 { diff --git a/indra/llmessage/tests/test_llsdmessage_peer.py b/indra/llmessage/tests/test_llsdmessage_peer.py index 5ba0749e31..8e9b6c09e7 100755 --- a/indra/llmessage/tests/test_llsdmessage_peer.py +++ b/indra/llmessage/tests/test_llsdmessage_peer.py @@ -33,8 +33,8 @@ import os import sys from http.server import HTTPServer, BaseHTTPRequestHandler -from llbase.fastest_elementtree import parse as xml_parse -from llbase import llsd +from llsd.fastest_elementtree import parse as xml_parse +import llsd from testrunner import freeport, run, debug, VERBOSE import time |