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 /scripts/metrics/slp_conv.py | |
| 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 'scripts/metrics/slp_conv.py')
| -rw-r--r-- | scripts/metrics/slp_conv.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/metrics/slp_conv.py b/scripts/metrics/slp_conv.py index 27f922b74a..25f9a8c060 100644 --- a/scripts/metrics/slp_conv.py +++ b/scripts/metrics/slp_conv.py @@ -29,7 +29,7 @@ Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA $/LicenseInfo$ """ -from llbase import llsd +import llsd import argparse parser = argparse.ArgumentParser( |