Second Life viewer sources 1.19.0.0

1 files changed, 13 insertions, 2 deletions

diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index 1b416b9..bf5bb63 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -14,12 +14,12 @@
 # ("GPL"), unless you have obtained a separate licensing agreement
 # ("Other License"), formally executed by you and Linden Lab.  Terms of
 # the GPL can be found in doc/GPL-license.txt in this distribution, or
-# online at http://secondlife.com/developers/opensource/gplv2
+# online at http://secondlifegrid.net/programs/open_source/licensing/gplv2
 # 
 # There are special exceptions to the terms and conditions of the GPL as
 # it is applied to this Source Code. View the full text of the exception
 # in the file doc/FLOSS-exception.txt in this software distribution, or
-# online at http://secondlife.com/developers/opensource/flossexception
+# online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
 # 
 # By copying, modifying or distributing this software, you acknowledge
 # that you have read and understood your obligations described above,
@@ -448,6 +448,7 @@ class LinuxManifest(ViewerManifest):
                 self.path("res/ll_icon.ico","secondlife.ico")
                 if self.prefix("linux_tools", ""):
                         self.path("client-readme.txt","README-linux.txt")
+                        self.path("client-readme-voice.txt","README-linux-voice.txt")
                         self.path("wrapper.sh","secondlife")
                         self.path("handle_secondlifeprotocol.sh")
                         self.path("register_secondlifeprotocol.sh")
@@ -517,6 +518,16 @@ class Linux_i686Manifest(LinuxManifest):
 #                        self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason
                         self.end_prefix("lib")
 
+                # Vivox runtimes
+                if self.prefix(src="vivox-runtime/i686-linux", dst=""):
+                        self.path("SLVoice")
+                        self.end_prefix()
+                if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
+                        self.path("libopenal.so.1")
+                        self.path("libortp.so")
+                        self.path("libvivoxsdk.so")
+                        self.path("libalut.so")
+                        self.end_prefix("lib")
 
 class Linux_x86_64Manifest(LinuxManifest):
         def construct(self):