summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authoralain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com>2011-03-24 10:32:02 -0700
committeralain@945battery-guestA-183.lindenlab.com <alain@945battery-guestA-183.lindenlab.com>2011-03-24 10:32:02 -0700
commit7986e092ec0a426d1f0e74811772db817d61ec47 (patch)
tree8a72002b558d0a0c28234e9b83656e847a99380d /indra/newview
parentf59de62bb20a7ab6bebeca32321c256911f036d4 (diff)
use vivox's openal for SLVoice because it isn't compatible with latest OpenAl version (should fix linux voice issues).
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/viewer_manifest.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0de6817072..92b6ff58b2 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -958,7 +958,6 @@ class Linux_i686Manifest(LinuxManifest):
self.path("libopenal.so")
self.path("libopenal.so.1")
self.path("libopenal.so.1.12.854")
- self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname
self.path("libfontconfig.so.1.4.4")
try:
self.path("libfmod-3.75.so")
@@ -975,7 +974,7 @@ class Linux_i686Manifest(LinuxManifest):
if self.prefix(src="../packages/lib/release", dst="lib"):
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("libvivoxoal.so.1")
self.path("libvivoxsdk.so")
self.path("libvivoxplatform.so")
self.end_prefix("lib")