Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio

2014-11-22 22:20:32 -06:00
parent f8927a8a11 2d0905a4a6
commit c2abbaedc8
130 changed files with 2810 additions and 2321 deletions
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -213,8 +213,11 @@ class WindowsManifest(ViewerManifest):
            self.end_prefix()

        # For mesh upload
-        if self.prefix(src=self.args['configuration'], dst=""):
+        if not self.is_win64() and self.prefix(src=self.args['configuration'], dst=""):
            self.path("libcollada14dom22.dll")
+            self.end_prefix()
+
+        if self.prefix(src=self.args['configuration'], dst=""):
            self.path("glod.dll")
            self.end_prefix()