diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-18 20:39:18 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-18 20:39:18 +0300 |
commit | 65ea8e1351c548b650eea4bd2ddef02b853c933d (patch) | |
tree | 71f06c51e20e4818a66d200e170f5d6f42a8b17c /indra/llaudio/llaudioengine.cpp | |
parent | 3fb9993a4a74c19b872bb96ed4878cd7b7143208 (diff) | |
parent | d031662435d97101411ae990ed85d6e001ab668a (diff) |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/llaudio/llaudioengine.cpp')
-rw-r--r-- | indra/llaudio/llaudioengine.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/llaudio/llaudioengine.cpp b/indra/llaudio/llaudioengine.cpp index d35f249973..e0ebbb76bd 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -1402,6 +1402,15 @@ bool LLAudioSource::setupChannel() return true; } +void LLAudioSource::stop() +{ + play(LLUUID::null); + if (mCurrentDatap) + { + // always reset data if something wants us to stop + mCurrentDatap = nullptr; + } +} bool LLAudioSource::play(const LLUUID &audio_uuid) { |