diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-03 17:09:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-03 17:09:22 -0500 |
| commit | 7549df0eaf347e9f490f9cfaf4950dd623a08237 (patch) | |
| tree | 2949dade42fc865c5abd83854b9f04529a01c581 /indra/llaudio/llaudioengine.cpp | |
| parent | 4f5b27c933c827b98886d6218908b83e85672e3e (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
merging beta fixes after 2.4.0-beta1
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 1cc03bddb8..c9cb1cd6e7 100644 --- a/indra/llaudio/llaudioengine.cpp +++ b/indra/llaudio/llaudioengine.cpp @@ -1557,6 +1557,10 @@ bool LLAudioSource::hasPendingPreloads() const LLAudioData *adp = iter->second; // note: a bad UUID will forever be !hasDecodedData() // but also !hasValidData(), hence the check for hasValidData() + if (!adp) + { + continue; + } if (!adp->hasDecodedData() && adp->hasValidData()) { // This source is still waiting for a preload |