summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-10-14 11:57:11 -0500
committerDave Parks <davep@lindenlab.com>2010-10-14 11:57:11 -0500
commitbd0a4d87f5631a13885af1e9491304bc40edad64 (patch)
treed1052fc087920a743f088f35e08066bc0a21801b /indra
parentea2fa54635f5180189db0a240fc11ca91df6541c (diff)
Fix for debug build (copy correct collada dll).
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/viewer_manifest.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index cd1b9bf048..8d6891635a 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -280,7 +280,11 @@ class WindowsManifest(ViewerManifest):
# Mesh 3rd party libs needed for auto LOD and collada reading
try:
- self.path("libcollada14dom21.dll")
+ if self.args['configuration'].lower() == 'debug':
+ self.path("libcollada14dom21-d.dll")
+ else:
+ self.path("libcollada14dom21.dll")
+
self.path("glod.dll")
except RuntimeError, err:
print err.message