aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview
diff options
context:
space:
mode:
authorJacek Antonelli2010-08-27 12:25:15 -0500
committerJacek Antonelli2010-08-27 12:25:15 -0500
commitbc28c728a54e82edc6ad1152caf5e00281871cd7 (patch)
tree85182d0aea3fe5893a36eff7d4b68fd5f7063636 /linden/indra/newview
parentFixed terminology in the Vivox agreement window. (diff)
downloadmeta-impy-bc28c728a54e82edc6ad1152caf5e00281871cd7.zip
meta-impy-bc28c728a54e82edc6ad1152caf5e00281871cd7.tar.gz
meta-impy-bc28c728a54e82edc6ad1152caf5e00281871cd7.tar.bz2
meta-impy-bc28c728a54e82edc6ad1152caf5e00281871cd7.tar.xz
Added Vivox files to Linux manifest.
Diffstat (limited to 'linden/indra/newview')
-rwxr-xr-xlinden/indra/newview/viewer_manifest.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py
index bdbc5ff..0c1f89a 100755
--- a/linden/indra/newview/viewer_manifest.py
+++ b/linden/indra/newview/viewer_manifest.py
@@ -991,10 +991,16 @@ class Linux_i686Manifest(LinuxManifest):
991 991
992 self.end_prefix("lib") 992 self.end_prefix("lib")
993 993
994 # Vivox runtimes 994 # Vivox runtimes and libs
995# if self.prefix(src="vivox-runtime/i686-linux", dst="bin"): 995 if self.prefix(src="vivox-runtime/i686-linux", dst="bin"):
996# self.path("SLVoice") 996 self.path("SLVoice")
997# self.end_prefix() 997 self.end_prefix("bin")
998
999 if self.prefix(src="vivox-runtime/i686-linux", dst="lib"):
1000 self.path("libalut.so")
1001 self.path("libortp.so")
1002 self.path("libvivoxsdk.so")
1003 self.end_prefix("lib")
998 1004
999 1005
1000class Linux_x86_64Manifest(LinuxManifest): 1006class Linux_x86_64Manifest(LinuxManifest):