diff options
| author | Andrew de Laix <alain@lindenlab.com> | 2011-03-14 20:24:55 +0000 |
|---|---|---|
| committer | Andrew de Laix <alain@lindenlab.com> | 2011-03-14 20:24:55 +0000 |
| commit | ec0c28ad8383dd6b342a317d15d44015fde15416 (patch) | |
| tree | fcc0921103b35438416570ed653a8828a7cfb7e2 | |
| parent | c41d9949d797312626d44c639766b285111d608b (diff) | |
update ogg-vorbis archive for linux.
| -rw-r--r-- | autobuild.xml | 4 | ||||
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/autobuild.xml b/autobuild.xml index 2848a7e0f7..5be2a6fa70 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 84105ddfca..f0b44f97d2 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, |