Restored zlib1.dll (not a bad entry)

2 files changed, 10 insertions, 2 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8376c1a..91b3226 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,26 +10,32 @@
                 modified:   linden/indra/cmake/CopyWinLibs.cmake
                 modified:   linden/install.xml
                 
+                
         * Fixed VC++ error C2864: 'LLAudioEngine_OpenAL::WIND_BUFFER_SIZE_SEC' : 
                 only static const integral data members can be initialized within a class.
                 
                 modified:   linden/indra/llaudio/audioengine_openal.cpp
                 modified:   linden/indra/llaudio/audioengine_openal.h
                 
+                
         * Fixed VC++ warning C4305: '=' : truncation from 'double' to 'float' for mVolume.
                 
                 modified:   linden/indra/llmedia/llmediaimplgstreamer.cpp
                 
+                
         * Removed bad entries from copy_win_libs.
+        * Restored zlib1.dll (not a bad entry).
                 
                 modified:   linden/indra/cmake/CopyWinLibs.cmake
                 
+                
         * Removed old linden glib entry that was interfering.
         * Updated windows zlib archive.
         * Updated windows iconv archive.
                 
                 modified:   linden/install.xml
                 
+                
         * Placed the gstreamer plugins in newview where they belong.
                 
                 modified:   linden/indra/cmake/CopyWinLibs.cmake
diff --git a/linden/indra/cmake/CopyWinLibs.cmake b/linden/indra/cmake/CopyWinLibs.cmake
index afc99d6..e10b0da 100644
--- a/linden/indra/cmake/CopyWinLibs.cmake
+++ b/linden/indra/cmake/CopyWinLibs.cmake
@@ -59,6 +59,7 @@ set(debug_files
         libogg-0.dll
         liboil-0.3-0.dll
         libopenjpeg-2.dll
+    libpng12-0.dll
         libschroedinger-1.0-0.dll
         libspeex-1.dll
         libtheora-0.dll
@@ -66,7 +67,7 @@ set(debug_files
         libvorbisenc-2.dll
         libxml2-2.dll
     xvidcore.dll
-    libpng12-0.dll
+    zlib1.dll
     )
 
 copy_if_different(
@@ -129,6 +130,7 @@ set(release_files
         libogg-0.dll
         liboil-0.3-0.dll
         libopenjpeg-2.dll
+    libpng12-0.dll
         libschroedinger-1.0-0.dll
         libspeex-1.dll
         libtheora-0.dll
@@ -136,7 +138,7 @@ set(release_files
         libvorbisenc-2.dll
         libxml2-2.dll
     xvidcore.dll
-    libpng12-0.dll
+    zlib1.dll
     )
     
 copy_if_different(