diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 14:46:19 -0500 |
| commit | 36954908632d6f5366f6517023676c1bcd71aa17 (patch) | |
| tree | 3c46d7c43e474ba71596ebec5730cf0f0ed72a1a /indra/llaudio/llaudioengine.cpp | |
| parent | c6302cfbc750171ef536426d40e966e43e3aedc9 (diff) | |
| parent | 375d91019eefa0f2bc4f4685fb0f34dac987b189 (diff) | |
merge fixes for STORM-432
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 |