diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-27 06:39:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-27 06:39:42 -0400 |
| commit | 5b316df2249fc62c1e6a4f089b9726c4e62f23e0 (patch) | |
| tree | 550521651fb4a14124f9c6aed3c9018b29d92920 /indra/llaudio/llaudiodecodemgr.cpp | |
| parent | b7b9a37bc13d40a3caf7ea77d6857c2bb6036e06 (diff) | |
| parent | 3df0b60b3ad338a62a27e1492990f15c1393ea03 (diff) | |
merge out latest 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 |