Revert to using Vivox SDK 2 on Linux

indra/newview/llvoicevivox.cpp

@@ -843,7 +843,13 @@ void LLVivoxVoiceClient::stateMachine()
 						}
 
 						args += " -ll ";
+// Singu Note: hard code log level to -1 for Linux, as we are using 2.x version of the SDK there
+// Singu TODO: Remove this when the Vivox SDK 4.x is working on Linux
+#if LL_LINUX
+						args += "-1":
+#else
 						args += loglevel;
+#endif
 
 						// If we allow multiple instances of the viewer to start the voicedaemon
 						if (gSavedSettings.getBOOL("VoiceMultiInstance"))

indra/newview/viewer_manifest.py

@@ -856,9 +856,6 @@ 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("libvivoxplatform.so")
                 self.path("libvivoxsdk.so")
                 self.end_prefix("lib")
 
@@ -917,9 +914,6 @@ class Linux_x86_64Manifest(LinuxManifest):
         if self.prefix(src="vivox-runtime/i686-linux", dst="lib32"):
             #self.path("libalut.so")
             self.path("libortp.so")
-            self.path("libsndfile.so.1")
-            self.path("libvivoxoal.so.1")
-            self.path("libvivoxplatform.so")
             self.path("libvivoxsdk.so")
             self.end_prefix("lib32")
 

install.xml

@@ -1360,16 +1360,16 @@
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>2d7bf76438a6a13f1b3ee682af446f93</string>
+            <string>01573510dce7f380f44e561ef2f3dd9f</string>
             <key>url</key>
-            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/slvoice-4.5.0009.17865-linux-20140312.tar.bz2</uri>
+            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>
             <key>md5sum</key>
-            <string>2d7bf76438a6a13f1b3ee682af446f93</string>
+            <string>01573510dce7f380f44e561ef2f3dd9f</string>
             <key>url</key>
-            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/slvoice-4.5.0009.17865-linux-20140312.tar.bz2</uri>
+            <uri>https://bitbucket.org/SingularityViewer/libraries/downloads/vivox-2.1.3010.6270-linux-20090309.tar.bz2</uri>
           </map>
           <key>windows</key>
           <map>