diff options
author | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-06-19 13:59:52 -0400 |
commit | e23228fef2834587af490d0345f29212445666d8 (patch) | |
tree | dfa761027aca1227ec1817707f8141b833c061df /indra/llaudio/llaudioengine.cpp | |
parent | c880c961bb2a0838bc529efc07cfeb12f5636d88 (diff) | |
parent | 8a330ee2eb1008951f5e5159057fa5736dd805b4 (diff) |
merge 3.5.0-release
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
-rw-r--r-- | indra/llaudio/llaudioengine.cpp | 4 |
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) { |