diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-06-28 11:02:11 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-06-28 11:02:11 -0400 |
| commit | 726851b039b0b0e7d623970f32b6b28616a07dc8 (patch) | |
| tree | 01dd9d23638486031dcc49d201c35d8338091794 /indra/newview/viewer_manifest.py | |
| parent | e9d2f57866e7e4dcb46b21bef525eb9955691578 (diff) | |
| parent | 6f8b812ecd73bf25d44445e1b791f9e1b01f429f (diff) | |
DRTVWR-582: Merge branch DRTVWR-582-maint-U into contribute-frozen
to resolve conflicts in installer_template.nsi
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): |