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/llcommon/tests | |
parent | bb5e40a1fdc35b3a41925f91684bc76854338cfb (diff) | |
parent | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff) |
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
Diffstat (limited to 'indra/llcommon/tests')
-rw-r--r-- | indra/llcommon/tests/llleap_test.cpp | 2 | ||||
-rw-r--r-- | indra/llcommon/tests/llsdserialize_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/tests/llleap_test.cpp b/indra/llcommon/tests/llleap_test.cpp index 7ee36a9ea6..60005fc6a9 100644 --- a/indra/llcommon/tests/llleap_test.cpp +++ b/indra/llcommon/tests/llleap_test.cpp @@ -109,7 +109,7 @@ namespace tut "import os\n" "import sys\n" "\n" - "from llbase import llsd\n" + "import llsd\n" "\n" "class ProtocolError(Exception):\n" " def __init__(self, msg, data):\n" diff --git a/indra/llcommon/tests/llsdserialize_test.cpp b/indra/llcommon/tests/llsdserialize_test.cpp index 5dbcf4c9b8..d7c11c5021 100644 --- a/indra/llcommon/tests/llsdserialize_test.cpp +++ b/indra/llcommon/tests/llsdserialize_test.cpp @@ -1706,7 +1706,7 @@ namespace tut // scanner. import_llsd("import os.path\n" "import sys\n" - "from llbase import llsd\n") + "import llsd\n") {} ~TestPythonCompatible() {} |