diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-06-02 18:37:47 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-06-02 18:37:47 +0300 |
| commit | 0a342cfe7cc92cdfe308bc75753750c99b0327e6 (patch) | |
| tree | fffe7e213636edcd5e04f276e98f086208ac6510 /indra/llmessage | |
| parent | 3b13c0ca15e2bc413731b0be07db6446bb32df1b (diff) | |
| parent | 364516e8bc19f6435fd42893809080d4f64a3232 (diff) | |
Merge branch 'xcode-14.3' into DRTVWR-582-maint-U
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/llcommon/tests/llleap_test.cpp
# indra/llcommon/tests/llsdserialize_test.cpp
# indra/newview/llmeshrepository.cpp
Diffstat (limited to 'indra/llmessage')
| -rwxr-xr-x | indra/llmessage/tests/test_llsdmessage_peer.py | 4 |
1 files changed, 2 insertions, 2 deletions
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 |