Automated merge with https://bitbucket.org/mani_linden/viewer-autobuild

autobuild.xml

@@ -1330,7 +1330,7 @@
       <key>slvoice</key>
       <map>
         <key>license_file</key>
-        <string>LICENSES/apr_suite.txt</string>
+        <string>LICENSES/slvoice.txt</string>
         <key>name</key>
         <string>vivox</string>
         <key>platforms</key>
@@ -1347,6 +1347,18 @@
             <key>name</key>
             <string>darwin</string>
           </map>
+          <key>linux</key>
+          <map>
+            <key>archive</key>
+            <map>
+              <key>hash</key>
+              <string>827ebbcddb31516e7e40a37374a52ebf</string>
+              <key>url</key>
+              <string>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/vivox-3.1.0001.8821-linux-20101018.tar.bz2</string>
+            </map>
+            <key>name</key>
+            <string>linux</string>
+          </map>
           <key>windows</key>
           <map>
             <key>archive</key>

indra/cmake/Copy3rdPartyLibs.cmake

@@ -155,9 +155,9 @@ elseif(DARWIN)
 elseif(LINUX)
     # linux is weird, multiple side by side configurations aren't supported
     # and we don't seem to have any debug shared libs built yet anyways...
-    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}")
+    set(SHARED_LIB_STAGING_DIR_DEBUG            "${SHARED_LIB_STAGING_DIR}/debug")
     set(SHARED_LIB_STAGING_DIR_RELWITHDEBINFO   "${SHARED_LIB_STAGING_DIR}")
-    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}")
+    set(SHARED_LIB_STAGING_DIR_RELEASE          "${SHARED_LIB_STAGING_DIR}/release")
 
     set(vivox_src_dir "${ARCH_PREBUILT_DIRS_RELEASE}")
     set(vivox_files