Pull from jenn_linden/viewer-vs2010

4 files changed, 14 insertions, 14 deletions

diff --git a/autobuild.xml b/autobuild.xml
index 57d9e9897e..9b6f50a6df 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -920,9 +920,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>20546118096e4828d9f29913ec7d954a</string>
+              <string>840cd9455638c0ea52c613cfddd07d5b</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/221698/arch/Linux/installer/jsoncpp-0.5.0-linux-20110219.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-jsoncpp/rev/223959/arch/Linux/installer/jsoncpp-0.5.0-linux-20110315.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1258,7 +1258,7 @@
         <key>license</key>
         <string>openSSL</string>
         <key>license_file</key>
-        <string>LICENSES/openSSL.txt</string>
+        <string>LICENSES/openssl.txt</string>
         <key>name</key>
         <string>openSSL</string>
         <key>platforms</key>
@@ -1280,9 +1280,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>511cf1c200efe587552b8225dd361dbb</string>
+              <string>cc159598ef3fcd34fd33a8a0ef846165</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openSSL-0.9.7c-linux-20100930.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/223711/arch/Linux/installer/openssl-0.9.8q-linux-20110314.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1536,9 +1536,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>3580c3729a034adff005a234f3ce6e84</string>
+              <string>174ab797440157956eda7061dae37564</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-linux-20100929.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-xmlrpc-epi/rev/223735/arch/Linux/installer/xmlrpc_epi-0.54.1-linux-20110314.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1584,9 +1584,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>7e2818075e89f0729e869a244eafbbf7</string>
+              <string>7b4cf3aa2c04937d0a20761516587896</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/zlib-1.2.3dfsg-linux-20100929.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-zlib/rev/223739/arch/Linux/installer/zlib-1.2.5-linux-20110314.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index c942fafabd..f1584ff0c4 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -244,7 +244,7 @@ elseif(LINUX)
         libaprutil-1.so.0
         libatk-1.0.so
         libbreakpad_client.so.0
-        libcrypto.so.0.9.7
+        libcrypto.so.0.9.8
         libdb-5.1.so
         libexpat.so
         libexpat.so.1
@@ -260,7 +260,7 @@ elseif(LINUX)
         libstacktrace.so
         libtcmalloc.so
         libuuid.so.1
-        libssl.so.0.9.7
+        libssl.so.0.9.8
         libfontconfig.so.1.4.4
        )
 
diff --git a/indra/cmake/JsonCpp.cmake b/indra/cmake/JsonCpp.cmake
index 644b417e17..53801a5737 100644
--- a/indra/cmake/JsonCpp.cmake
+++ b/indra/cmake/JsonCpp.cmake
@@ -16,7 +16,7 @@ else (STANDALONE)
   elseif (DARWIN)
     set(JSONCPP_LIBRARIES libjson_darwin_libmt.a)
   elseif (LINUX)
-    set(JSONCPP_LIBRARIES libjsoncpp.a)
+    set(JSONCPP_LIBRARIES libjson_linux-gcc-4.1.3_libmt.a)
   endif (WINDOWS)
   set(JSONCPP_INCLUDE_DIRS "${LIBS_PREBUILT_DIR}/include/jsoncpp" "${LIBS_PREBUILT_DIR}/include/json")
 endif (STANDALONE)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 229055fdb7..addaafa494 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -935,9 +935,9 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libaprutil-1.so.0.3.10")
             self.path("libbreakpad_client.so.0.0.0")
             self.path("libdb-5.1.so")
-            self.path("libcrypto.so.0.9.7")
+            self.path("libcrypto.so.0.9.8")
             self.path("libexpat.so.1.5.2")
-            self.path("libssl.so.0.9.7")
+            self.path("libssl.so.0.9.8")
             self.path("libuuid.so.1")
             self.path("libSDL-1.2.so.0.11.3")
             self.path("libdirectfb-1.4.so.5.0.4")