From c504c40a754a79baf0e4b1d1c10ca44197d577df Mon Sep 17 00:00:00 2001
From: Palmer <palmer@lindenlab.com>
Date: Fri, 29 Jan 2010 15:04:14 -0800
Subject: Added glod.txt and libraries no longer unzipped into newview

---
 indra/cmake/Copy3rdPartyLibs.cmake |  4 ++++
 indra/newview/viewer_manifest.py   | 11 +++++------
 install.xml                        |  8 ++++----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index faf9da8b14..9a54c7a2e8 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -38,6 +38,8 @@ if(WINDOWS)
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
+        libcollada14dom21.dll
+        glod.dll
         )
 
     # *TODO - update this to use LIBS_PREBUILT_DIR and LL_ARCH_DIR variables
@@ -48,6 +50,8 @@ if(WINDOWS)
         libapr-1.dll
         libaprutil-1.dll
         libapriconv-1.dll
+        libcollada14dom21.dll
+        glod.dll
         )
 
     if(USE_GOOGLE_PERFTOOLS)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 37c2102e8f..595afd86e0 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -268,12 +268,17 @@ class WindowsManifest(ViewerManifest):
                 self.path('libapr-1.dll')
                 self.path('libaprutil-1.dll')
                 self.path('libapriconv-1.dll')
+                
             except RuntimeError, err:
                 print err.message
                 print "Skipping llcommon.dll (assuming llcommon was linked statically)"
 
             self.disable_manifest_check()
 
+            # Mesh 3rd party libs needed for auto LOD and collada reading
+            self.path("libcollada14dom21.dll")
+            self.path("glod.dll")
+
             # For textures
             if self.args['configuration'].lower() == 'debug':
                 self.path("openjpegd.dll")
@@ -320,12 +325,6 @@ class WindowsManifest(ViewerManifest):
         # For using FMOD for sound... DJS
         self.path("fmod.dll")
        
-        # For automatic level of detail generation in mesh importer
-        self.path("glod.dll")
-
-        # For reading collada files
-        self.path("libcollada14dom21.dll")
-
         self.enable_no_crt_manifest_check()
 
         # Media plugins - QuickTime
diff --git a/install.xml b/install.xml
index 91276ca498..c4c2904471 100644
--- a/install.xml
+++ b/install.xml
@@ -70,9 +70,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>b97aa644a548310ca3c916518bb07b7e</string>
+            <string>39fae44d406aa56a0b3d00f5433bbf15</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GLOD-windows-20090915.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/GLOD-1.0pre4-windows-20100129.tar.bz2</uri>
           </map>
         </map>
       </map>
@@ -280,9 +280,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>c239ce23ed3f0dbbe58a1ddba05aee0b</string>
+            <string>6c2267ba2735bb5bc6229bc4366fce86</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1.1-windows-20091103.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/colladadom-2.1.1-windows-20100129.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.2.3