From ff7c3ad97ce0149de04b837fc8ec511be0b51f6d Mon Sep 17 00:00:00 2001
From: "alain@945battery-guestA-183.lindenlab.com"
<alain@945battery-guestA-183.lindenlab.com>
Date: Fri, 25 Mar 2011 13:40:26 -0700
Subject: [PATCH] Backed out changeset 6e69fbe64617
---
indra/newview/viewer_manifest.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 92b6ff58b2d..0de6817072c 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -958,6 +958,7 @@ def construct(self):
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")
@@ -974,7 +975,7 @@ def construct(self):
if self.prefix(src="../packages/lib/release", dst="lib"):
self.path("libortp.so")
self.path("libsndfile.so.1")
- self.path("libvivoxoal.so.1")
+ #self.path("libvivoxoal.so.1") # no - we'll re-use the viewer's own OpenAL lib
self.path("libvivoxsdk.so")
self.path("libvivoxplatform.so")
self.end_prefix("lib")
--
GitLab