From ec0c28ad8383dd6b342a317d15d44015fde15416 Mon Sep 17 00:00:00 2001
From: Andrew de Laix <alain@lindenlab.com>
Date: Mon, 14 Mar 2011 20:24:55 +0000
Subject: [PATCH] update ogg-vorbis archive for linux.
---
autobuild.xml | 4 ++--
indra/llaudio/llaudiodecodemgr.cpp | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 2848a7e0f7d..5be2a6fa705 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1232,9 +1232,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>d4bda5baabfbfbd92ea7bd2a48c7fb8a</string>
+ <string>17c000ceef32c0623d038b4c73791bee</string>
<key>url</key>
- <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ogg-vorbis-1.2.0-linux-20100929.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-ogvorbis/rev/222841/arch/Linux/installer/ogg_vorbis-1.1.3-1.2.0-linux-20110307.tar.bz2</string>
</map>
<key>name</key>
<string>linux</string>
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp
index 84105ddfcae..f0b44f97d28 100644
--- a/indra/llaudio/llaudiodecodemgr.cpp
+++ b/indra/llaudio/llaudiodecodemgr.cpp
@@ -680,7 +680,7 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid)
return FALSE;
}
-#ifdef LL_DARWIN
+#if LL_DARWIN || LL_LINUX
// HACK: to fool the compiler into not emitting unused warnings.
namespace {
const ov_callbacks callback_array[4] = {OV_CALLBACKS_DEFAULT, OV_CALLBACKS_NOCLOSE, OV_CALLBACKS_STREAMONLY,
--
GitLab