diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:26:30 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-07-18 14:38:18 -0700 |
| commit | ae63ed51aa4437bcca1c4f3813f1f6279facc107 (patch) | |
| tree | 4b74d7dbc258ec9236ab0154b6a83d6b36ce7d63 /indra/llmessage | |
| parent | bb5e40a1fdc35b3a41925f91684bc76854338cfb (diff) | |
| parent | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff) | |
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
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 |