summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorBrad Linden <brad@lindenlab.com>2023-07-18 14:26:30 -0700
committerBrad Linden <brad@lindenlab.com>2023-07-18 14:38:18 -0700
commitae63ed51aa4437bcca1c4f3813f1f6279facc107 (patch)
tree4b74d7dbc258ec9236ab0154b6a83d6b36ce7d63 /indra/llcorehttp
parentbb5e40a1fdc35b3a41925f91684bc76854338cfb (diff)
parent178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff)
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
Diffstat (limited to 'indra/llcorehttp')
-rwxr-xr-xindra/llcorehttp/tests/test_llcorehttp_peer.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py
index 185e8e25c6..b9992538ba 100755
--- a/indra/llcorehttp/tests/test_llcorehttp_peer.py
+++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py
@@ -38,7 +38,7 @@ from io import StringIO
from http.server import HTTPServer, BaseHTTPRequestHandler
-from llbase import llsd
+import llsd
# we're in llcorehttp/tests ; testrunner.py is found in llmessage/tests
sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir,