diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-12-09 10:20:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-12-09 10:20:59 -0500 |
| commit | 2906a61a93548eb56e217dda356a2889e913fe34 (patch) | |
| tree | e515545f9565abb77c1673841bfa17186adb4a44 /indra | |
| parent | 84ba2a8797303eb85a253b9c786bead38457fda5 (diff) | |
remove non-functional attempt to load llbase from the viewer tree; it is not there any more
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 814eee202d..a8049d874d 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -41,10 +41,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 -try: - from llbase import llsd -except ImportError: - from indra.base import llsd +from llbase import llsd class ViewerManifest(LLManifest): def is_packaging_viewer(self): |