summaryrefslogtreecommitdiff
path: root/indra/newview/viewer_manifest.py
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-04-07 15:26:43 -0500
committerDave Parks <davep@lindenlab.com>2010-04-07 15:26:43 -0500
commit711bcaf2ad43bc287b0af97c9e016b3d9a2abd77 (patch)
treeeb856280b05c8783aabfa35b9a9c75285956da32 /indra/newview/viewer_manifest.py
parent88a9c9b51714e9613a1fd058891b0a68f89ab55a (diff)
Fix for build failing.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rwxr-xr-xindra/newview/viewer_manifest.py8
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':