summaryrefslogtreecommitdiff
path: root/indra/llaudio
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2011-03-14 22:52:11 -0700
committerMerov Linden <merov@lindenlab.com>2011-03-14 22:52:11 -0700
commit35b61cdd44a9195a5174a8bd22e96e6b404f42bc (patch)
tree8fa3c0e0e055d2995b86c212105ed5910392c320 /indra/llaudio
parentab27883b7ec6e3affde28ab061654adb264526c7 (diff)
parent72d1febadb5f254eb7199bd26eb04a7553a6e55d (diff)
Pull from jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/llaudio')
-rw-r--r--indra/llaudio/llaudiodecodemgr.cpp8
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