diff options
| author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-04-13 17:33:58 -0700 |
|---|---|---|
| committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-04-13 17:33:58 -0700 |
| commit | f480e1e8fc8d5e7f0c10eec26e03430e5aed8eaa (patch) | |
| tree | a2331f2444183d4399323eec28343a5b8013ffb6 /indra/newview/viewer_manifest.py | |
| parent | e0bfefbd63449c0fe5ef7964677948f012d51506 (diff) | |
| parent | 0660cf0c987385dc2923bff389c7fa1bc0feec81 (diff) | |
Merge
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 659ce4a47b..99dfc07cd5 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -276,8 +276,12 @@ class WindowsManifest(ViewerManifest): self.disable_manifest_check() # Mesh 3rd party libs needed for auto LOD and collada reading - self.path("libcollada14dom21.dll") - self.path("glod.dll") + try: + self.path("libcollada14dom21.dll") + self.path("glod.dll") + except RuntimeError, err: + print err.message + print "Skipping COLLADA and GLOD libraries (assumming linked statically)" # For textures if self.args['configuration'].lower() == 'debug': |