summaryrefslogtreecommitdiff
path: root/indra/llaudio/llaudioengine.cpp
diff options
context:
space:
mode:
authorsimon <none@none>2013-03-25 12:19:02 -0700
committersimon <none@none>2013-03-25 12:19:02 -0700
commita976f5c217ce97c70a7e151b9a490e6a6ebf1396 (patch)
tree8d86c9060ac05b34b1a9dfd25f03451e18dcc326 /indra/llaudio/llaudioengine.cpp
parentcc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff)
parent98a82c50d539451e1931826ca75fbc01d611806d (diff)
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
-rw-r--r--indra/llaudio/llaudioengine.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp
index ef560cd7fc..06e752cf34 100644
--- a/indra/llaudio/llaudioengine.cpp
+++ b/indra/llaudio/llaudioengine.cpp
@@ -839,6 +839,10 @@ void LLAudioEngine::triggerSound(const LLUUID &audio_uuid, const LLUUID& owner_i
asp->play(audio_uuid);
}
+void LLAudioEngine::triggerSound(SoundData& soundData)
+{
+ triggerSound(soundData.audio_uuid, soundData.owner_id, soundData.gain, soundData.type, soundData.pos_global);
+}
void LLAudioEngine::setListenerPos(LLVector3 aVec)
{