diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-18 08:08:12 -0400 |
| commit | 7e3c32308c1f7d9e325fae55e7116b5fe3f460ca (patch) | |
| tree | fac07085cf1b416ef3fb240961913758ebf6b435 /indra/llaudio/llaudiodecodemgr.cpp | |
| parent | f64a20ddcff91677b02b7688e08819cffb0989c9 (diff) | |
| parent | 28eaade69b4b330db7a9dfea528cc4f0a3998841 (diff) | |
merge out 2.6.0 changes 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 |