diff options
author | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
---|---|---|
committer | Simon Linden <simon@lindenlab.com> | 2013-03-19 16:20:53 -0700 |
commit | d5561a1ada5cf171c8e281e910a7e989496c3705 (patch) | |
tree | 456cbb2374242d5508cc13165c876cd0672f6cd0 /indra/llaudio/llaudioengine.cpp | |
parent | a8245c51b9cd6fac1d26932dbb1fcf052f00da18 (diff) | |
parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) |
Merge in viewer-beta to get CHUI code
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) { |