diff options
author | Dave Parks <davep@lindenlab.com> | 2010-10-14 15:38:02 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2010-10-14 15:38:02 -0500 |
commit | 8163cd9e6fbc2f31bd3c17c843ec7e3539e0d1ee (patch) | |
tree | 018e277df4458ff5dd4a79b00be352d31f52fa82 /indra/newview/viewer_manifest.py | |
parent | 0c551bd3c85dc343eea6680cc054abe7106b1480 (diff) | |
parent | e5943ac8d1d013ac558a30f9288d79fcb2b2b441 (diff) |
merge
Diffstat (limited to 'indra/newview/viewer_manifest.py')
-rw-r--r-- | indra/newview/viewer_manifest.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 72e3336fd9..6a5518fb20 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -274,7 +274,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 |