summaryrefslogtreecommitdiff
path: root/indra/llaudio/llaudioengine.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-04-02 11:18:29 -0500
committerDave Parks <davep@lindenlab.com>2013-04-02 11:18:29 -0500
commit3e8da4e8d5ec7a477db00de99ec4c75985c17094 (patch)
treea76d4b02258d9b2d3d12e7640a7a50830c007241 /indra/llaudio/llaudioengine.cpp
parent8f9ddc67fdcdf53313ae4217ffa551a5a157c765 (diff)
parent5f5732365b3c5a3b85fdc0be6fbbbbc0c2de01f2 (diff)
Automated merge with https://bitbucket.org/lindenlab/davep-materials
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)
{