diff options
| author | Merov Linden <merov@lindenlab.com> | 2013-01-29 17:50:17 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2013-01-29 17:50:17 -0800 |
| commit | 3f4a5625082ecbd7273983e91eeb6f469c327393 (patch) | |
| tree | bf944a0283ec8438b941c2e2773b7656f952996e /indra/llaudio/llaudioengine.cpp | |
| parent | df84e3c1876c5d2b321f0a8596e7e2a936073156 (diff) | |
| parent | edb5be4ec0a88931933a27dc7e94d45ea249591d (diff) | |
Pull merge from lindenlab/viewer-chui
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) { |