diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-20 20:22:54 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-20 20:22:54 -0400 |
| commit | 120f31502eb521c1e0abaeb24972f070e7f75bd6 (patch) | |
| tree | 281d3b7f87f02f9e9c0a092bbb35387dd77119e1 | |
| parent | 252cb50c387b47360f5fd05cc3338daea0ddc8ba (diff) | |
| parent | c7721b86c6df55cbfcdb51970944b79ed8674f4e (diff) | |
merge changes for storm-1183
| -rw-r--r-- | autobuild.xml | 8 | ||||
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 4 | ||||
| -rw-r--r-- | indra/newview/viewer_manifest.py | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/autobuild.xml b/autobuild.xml index a9ab71da29..80be16322a 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -510,9 +510,9 @@ <key>archive</key> <map> <key>hash</key> - <string>9b58d1a9c15807a1301e42a313641010</string> + <string>9f8a9dc39fd7c3da0fb3533782d1fddf</string> <key>url</key> - <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/freetype-2.4.4-linux-20110310.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/226814/arch/Linux/installer/freetype-2.3.9-linux-20110418.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -1242,9 +1242,9 @@ <key>archive</key> <map> <key>hash</key> - <string>cc159598ef3fcd34fd33a8a0ef846165</string> + <string>3d40be8566fa4b9df9a38e2a0f9ea467</string> <key>url</key> - <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> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-openssl/rev/226882/arch/Linux/installer/openssl-1.0.0d-linux-20110418.tar.bz2</string> </map> <key>name</key> <string>linux</string> diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 4698116022..1c43c4ce12 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -243,7 +243,7 @@ elseif(LINUX) libaprutil-1.so.0 libatk-1.0.so libbreakpad_client.so.0 - libcrypto.so.0.9.8 + libcrypto.so.1.0.0 libdb-5.1.so libexpat.so libexpat.so.1 @@ -259,7 +259,7 @@ elseif(LINUX) libtcmalloc.so libuuid.so.16 libuuid.so.16.0.22 - libssl.so.0.9.8 + libssl.so.1.0.0 libfontconfig.so.1.4.4 ) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index f0b1973fdf..f671c770ea 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -939,9 +939,9 @@ class Linux_i686Manifest(LinuxManifest): self.path("libdb-5.1.so") self.path("libdb-5.so") self.path("libdb.so") - self.path("libcrypto.so.0.9.8") + self.path("libcrypto.so.1.0.0") self.path("libexpat.so.1.5.2") - self.path("libssl.so.0.9.8") + self.path("libssl.so.1.0.0") self.path("libuuid.so") self.path("libuuid.so.16") self.path("libuuid.so.16.0.22") |