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/newview/viewer_manifest.py | |
parent | bb5e40a1fdc35b3a41925f91684bc76854338cfb (diff) | |
parent | 178fc5cbaaed8a3e47ec5ded5c124ebafcb4d1ab (diff) |
Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292)
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index c312c1d248..3a7c7d7f46 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -49,7 +49,7 @@ viewer_dir = os.path.dirname(__file__) # indra.util.llmanifest under their system Python! sys.path.insert(0, os.path.join(viewer_dir, os.pardir, "lib", "python")) from indra.util.llmanifest import LLManifest, main, path_ancestors, CHANNEL_VENDOR_BASE, RELEASE_CHANNEL, ManifestError, MissingError -from llbase import llsd +import llsd class ViewerManifest(LLManifest): def is_packaging_viewer(self): |