diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-08-17 13:16:13 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-08-17 13:16:13 -0400 |
| commit | 70c5dc871ba21ea0b08e84535d14530d0d8afd81 (patch) | |
| tree | 13998b4df2dee5ad4a2da1cacfb5d9c7929ff95d /indra/llcommon/tests | |
| parent | b5fe9c476943807aa7526f67dd648b5ad250824b (diff) | |
| parent | 9d981c72f8d098baeae9e9fa1e3c4737f957bbe2 (diff) | |
DRTVWR-588: Merge branch 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
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 671873e982..a5416d649f 100644 --- a/indra/llcommon/tests/llleap_test.cpp +++ b/indra/llcommon/tests/llleap_test.cpp @@ -103,7 +103,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 bb469f0686..335c25fcc9 100644 --- a/indra/llcommon/tests/llsdserialize_test.cpp +++ b/indra/llcommon/tests/llsdserialize_test.cpp @@ -1691,7 +1691,7 @@ namespace tut TestPythonCompatible(): import_llsd("import os.path\n" "import sys\n" - "from llbase import llsd\n") + "import llsd\n") {} ~TestPythonCompatible() {} |