summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2023-07-19 09:40:51 -0500
committerRunitaiLinden <davep@lindenlab.com>2023-07-19 09:40:51 -0500
commita44fa7b1a3392f74735c664d1852707f52eae00f (patch)
tree4abcaa2712f7bcad8241e4e549f4b302417b6e04 /indra/newview/viewer_manifest.py
parentbb08f68db1233870fd4615a68543220c8d608b93 (diff)
parentca008cfc3165eefeb42b2894e3e99ecf4c21f0c8 (diff)
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py2
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):