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/newview/viewer_manifest.py | |
| parent | b5fe9c476943807aa7526f67dd648b5ad250824b (diff) | |
| parent | 9d981c72f8d098baeae9e9fa1e3c4737f957bbe2 (diff) | |
DRTVWR-588: Merge branch 'DRTVWR-588-maint-W' into DRTVWR-588-cleanup-timers
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 89481add29..8a6a9b7b68 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): |