diff options
| author | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-03 11:38:46 -0800 |
|---|---|---|
| committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-12-03 11:38:46 -0800 |
| commit | 0ea483ce60c96d7f17cd461c617449f70a21d7a4 (patch) | |
| tree | 4c0f1cf5788511a6fb520dce49aad00d12461ff0 /indra/llaudio/llaudioengine.cpp | |
| parent | c767276ce62f18a295d64054beda438250abd4ae (diff) | |
| parent | 2491555272283340206f3532b9417ec07df40022 (diff) | |
merge
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 |