diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-10-05 21:16:35 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-05 21:16:35 +0000 |
| commit | 62f3daf588324278094110d466c4f2f1b8cc9ae8 (patch) | |
| tree | 69d7ff8c974c550987af8f960b736f27675d35f9 | |
| parent | 8f4df3a68f9446b8a0c65e49170522e14e0dc703 (diff) | |
Back out revisions 135028,134955,134953,134939
* Revert Vivox SDK update
(transplanted from 2e9e33886f348cb9f2c682c2dbfdf7a48371f12c)
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 14 | ||||
| -rw-r--r-- | install.xml | 12 |
2 files changed, 10 insertions, 16 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 036fa4923f..d3b0a2e47e 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -249,12 +249,10 @@ class WindowsManifest(ViewerManifest): # Vivox runtimes if self.prefix(src="vivox-runtime/i686-win32", dst=""): self.path("SLVoice.exe") - self.path("libsndfile-1.dll") - self.path("zlib1.dll") + self.path("alut.dll") self.path("vivoxsdk.dll") - self.path("vivoxplatform.dll") self.path("ortp.dll") - self.path("vivoxoal.dll") + self.path("wrap_oal.dll") self.end_prefix() # pull in the crash logger and updater from other projects @@ -464,11 +462,10 @@ class DarwinManifest(ViewerManifest): self.path("zh-Hans.lproj") # SLVoice and vivox lols - self.path("vivox-runtime/universal-darwin/libsndfile.dylib", "libsndfile.dylib") - self.path("vivox-runtime/universal-darwin/libvivoxoal.dylib", "libvivoxoal.dylib") + self.path("vivox-runtime/universal-darwin/libalut.dylib", "libalut.dylib") + self.path("vivox-runtime/universal-darwin/libopenal.dylib", "libopenal.dylib") self.path("vivox-runtime/universal-darwin/libortp.dylib", "libortp.dylib") self.path("vivox-runtime/universal-darwin/libvivoxsdk.dylib", "libvivoxsdk.dylib") - self.path("vivox-runtime/universal-darwin/libvivoxplatform.dylib", "libvivoxplatform.dylib") self.path("vivox-runtime/universal-darwin/SLVoice", "SLVoice") # need to get the kdu dll from any of the build directories as well @@ -721,10 +718,7 @@ class Linux_i686Manifest(LinuxManifest): self.end_prefix() if self.prefix(src="vivox-runtime/i686-linux", dst="lib"): self.path("libortp.so") - self.path("libsndfile.so.1") - self.path("libvivoxoal.so.1") self.path("libvivoxsdk.so") - self.path("libvivoxplatform.so") self.end_prefix("lib") class Linux_x86_64Manifest(LinuxManifest): diff --git a/install.xml b/install.xml index e5a59ff3b1..6366b3104b 100644 --- a/install.xml +++ b/install.xml @@ -1301,23 +1301,23 @@ anguage Infrstructure (CLI) international standard</string> <key>darwin</key> <map> <key>md5sum</key> - <string>3eb4b31e92e16567e2fa967df9f9b845</string> + <string>8675b5eedef038b514338b17f0e55961</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.0.0006.7278-darwin-20090930a.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-darwin-20090309.tar.bz2</uri> </map> <key>linux</key> <map> <key>md5sum</key> - <string>61ab6acd1f4736c5260c492bb60c26af</string> + <string>01573510dce7f380f44e561ef2f3dd9f</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.0.0006.7278-linux-20090930a.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri> </map> <key>windows</key> <map> <key>md5sum</key> - <string>ad5737dbfab87a13b23451b68248b22a</string> + <string>752daa90e07c05202d1f76980cb955eb</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-3.0.0006.7278-windows-20090930a.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/vivox-2.1.3010.6270-windows-20090309.tar.bz2</uri> </map> </map> </map> |