diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2023-08-16 08:25:50 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2023-08-16 08:25:50 -0400 |
commit | 6cf6f81ae865d4e15b715a93408c7970b6936ce8 (patch) | |
tree | c8232f05b4fb6ae8551d44d11517e89454be55ef /indra/llcommon/tests | |
parent | 5430efbb31cfc0f57eac7fd130bb43aafa85143a (diff) | |
parent | 48aecb5c8d10926caa62feb94231c3019162836a (diff) |
DRTVWR-588: Merge branch 'fix-monterey' into DRTVWR-588-monterey
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() {} |