diff options
author | Cho <cho@lindenlab.com> | 2013-01-30 02:56:33 +0000 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2013-01-30 02:56:33 +0000 |
commit | a7e6dc088fcd3d70dd74f0eef3c120ecd9296913 (patch) | |
tree | 09d1c90cf506793326ff7d75e9f5d2833d1b0a72 /indra/llaudio/llaudioengine.cpp | |
parent | 4f0237007a3a21cc502a1a15b0530bceaf5217db (diff) | |
parent | edb5be4ec0a88931933a27dc7e94d45ea249591d (diff) |
merging latest changes
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) { |