diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:36:12 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-22 09:36:12 -0800 |
| commit | 7365ee2d9d79813b6f515d333b63210d583038b5 (patch) | |
| tree | bd237c8141a0b5643038640f4bc24d1fb6d5fd65 /indra/llaudio/llaudioengine.cpp | |
| parent | 049b00a6f10d50609055810b0800f49476b351d2 (diff) | |
| parent | ab100825bd0064dc64b9ef8bea1c70bc04090716 (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 |