diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 17:18:18 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-06-19 17:18:18 +0000 |
| commit | 5df284b23a2e7db47cf89de72044fe5d3df1ccf4 (patch) | |
| tree | a543deec1323c4dc1cc42207277d0c47bbebdb66 /indra/llaudio/llaudioengine_openal.cpp | |
| parent | b84e79e0f206ac49aa57c4ad2d8d3dd7b5d2fc4d (diff) | |
| parent | ba6a0f3f332ffc659b00ca4c298b96efe56c6b81 (diff) | |
Merged in merge-6.4.4 (pull request #167)
Merge master 6.4.4 into DRTVWR-510
Diffstat (limited to 'indra/llaudio/llaudioengine_openal.cpp')
| -rw-r--r-- | indra/llaudio/llaudioengine_openal.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index e6ac586618..a38d8291fa 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -52,7 +52,7 @@ LLAudioEngine_OpenAL::~LLAudioEngine_OpenAL() } // virtual -bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata) +bool LLAudioEngine_OpenAL::init(const S32 num_channels, void* userdata, const std::string &app_title) { mWindGen = NULL; LLAudioEngine::init(num_channels, userdata); @@ -239,6 +239,13 @@ bool LLAudioChannelOpenAL::isPlaying() bool LLAudioChannelOpenAL::updateBuffer() { + if (!mCurrentSourcep) + { + // This channel isn't associated with any source, nothing + // to be updated + return false; + } + if (LLAudioChannel::updateBuffer()) { // Base class update returned true, which means that we need to actually |