From 4cbef35f503bb7ee8f489b354e4afb2350085709 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 16 Jul 2019 18:17:23 -0400
Subject: update Vivox for VOICE-56

---
 autobuild.xml                      | 14 +++++++-------
 indra/cmake/Copy3rdPartyLibs.cmake |  2 --
 indra/newview/viewer_manifest.py   |  2 --
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5f072512c1..3ab233a733 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -2940,9 +2940,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>a605ec940768c878527d3b8f2ff61288</string>
+              <string>fff83736e4dc4b22218cdd24aaada680</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/21421/157284/slvoice-4.9.0002.30313.517593-darwin64-517593.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40868/353426/slvoice-4.9.0002.32137.529403-darwin64-529403.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin64</string>
@@ -2976,9 +2976,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>5a78539626b5f23522d0b466247f48b4</string>
+              <string>f900bce6ac33056b817e0dd8e6ec0e1c</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/21422/157291/slvoice-4.9.0002.30313.517593-windows-517593.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40870/353440/slvoice-4.9.0002.32137.529403-windows-529403.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
@@ -2988,16 +2988,16 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>1f8e09c053c00d9dc44ea74568e63dc1</string>
+              <string>57800dbaa45d10d7886689113edbad59</string>
               <key>url</key>
-              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/21423/157298/slvoice-4.9.0002.30313.517593-windows64-517593.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/40869/353433/slvoice-4.9.0002.32137.529403-windows64-529403.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows64</string>
           </map>
         </map>
         <key>version</key>
-        <string>4.9.0002.30313.517593</string>
+        <string>4.9.0002.32137.529403</string>
       </map>
       <key>tut</key>
       <map>
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index dde53835fb..808b4601fb 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -173,7 +173,6 @@ elseif(DARWIN)
     set(vivox_files
         SLVoice
         libortp.dylib
-        libvivoxplatform.dylib
         libvivoxsdk.dylib
        )
     set(debug_src_dir "${ARCH_PREBUILT_DIRS_DEBUG}")
@@ -211,7 +210,6 @@ elseif(LINUX)
         libsndfile.so.1
         libortp.so
         libvivoxoal.so.1
-        libvivoxplatform.so
         libvivoxsdk.so
         SLVoice
        )
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index f56dd461d8..8a38f3a742 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1036,7 +1036,6 @@ class DarwinManifest(ViewerManifest):
                 for libfile in (
                                 'libortp.dylib',
                                 'libvivoxsdk.dylib',
-                                'libvivoxplatform.dylib',
                                 'SLVoice',
                                 ):
                     self.path2basename(relpkgdir, libfile)
@@ -1532,7 +1531,6 @@ class Linux_i686_Manifest(LinuxManifest):
             self.path("libsndfile.so.1")
             #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
             self.path("libvivoxsdk.so")
-            self.path("libvivoxplatform.so")
 
         self.strip_binaries()
 
-- 
cgit v1.2.3