Backed out changeset 1e36e0629994 copying .dylibs on Linux

The .dylib files in the Linux Vivox package were erroneous to start with;
while the affected changeset bypassed copy errors, it too was wrong. Now that
the Linux Vivox package contains Linux .so files, revert to the correct
filenames to copy.

2 files changed, 9 insertions, 9 deletions

diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index a1a9ff55f5..28202f85d6 100755
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -233,11 +233,11 @@ elseif(LINUX)
 
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files
-        libsndfile.dylib
-        libortp.dylib
-        libvivoxoal.dylib
-        libvivoxplatform.dylib
-        libvivoxsdk.dylib
+        libsndfile.so.1
+        libortp.so
+        libvivoxoal.so.1
+        libvivoxplatform.so
+        libvivoxsdk.so
         SLVoice
         # ca-bundle.crt   #No cert for linux.  It is actually still 3.2SDK.
        )
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c360fc32ac..2394dd26b9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1154,11 +1154,11 @@ class Linux_i686_Manifest(LinuxManifest):
                 self.path("SLVoice")
                 self.end_prefix()
             if self.prefix(src="../packages/lib/release", dst="lib"):
-                self.path("libortp.dylib")
-                self.path("libsndfile.dylib")
+                self.path("libortp.so")
+                self.path("libsndfile.so.1")
                 #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
-                self.path("libvivoxsdk.dylib")
-                self.path("libvivoxplatform.dylib")
+                self.path("libvivoxsdk.so")
+                self.path("libvivoxplatform.so")
                 self.end_prefix("lib")
 
             # plugin runtime