summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-07-19 09:40:51 -0500
committerRunitaiLinden <davep@lindenlab.com>2023-07-19 09:40:51 -0500
commita44fa7b1a3392f74735c664d1852707f52eae00f (patch)
tree4abcaa2712f7bcad8241e4e549f4b302417b6e04 /indra/llcorehttp
parentbb08f68db1233870fd4615a68543220c8d608b93 (diff)
parentca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (diff)
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
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,