diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-21 09:31:49 -0400 |
| commit | 9d2f08427b6f3643f642e3e599a19a2dce3101e7 (patch) | |
| tree | 529ff1ed1ac9961ec86f76ec51a6e92e931a64f9 /indra/llaudio/llaudiodecodemgr.cpp | |
| parent | df63c6931e81c034887611711095e3134b9a7318 (diff) | |
| parent | 819c7f0dd21b8b819cdc70686682e31cadf155d6 (diff) | |
pull updates to the start of 2.6.2 from viewer-development
Diffstat (limited to 'indra/llaudio/llaudiodecodemgr.cpp')
| -rw-r--r-- | indra/llaudio/llaudiodecodemgr.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/llaudio/llaudiodecodemgr.cpp b/indra/llaudio/llaudiodecodemgr.cpp index 01dfd03c18..f0b44f97d2 100644 --- a/indra/llaudio/llaudiodecodemgr.cpp +++ b/indra/llaudio/llaudiodecodemgr.cpp @@ -680,4 +680,10 @@ BOOL LLAudioDecodeMgr::addDecodeRequest(const LLUUID &uuid) return FALSE; } - +#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, + OV_CALLBACKS_STREAMONLY_NOCLOSE}; +} +#endif |