diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-11-24 10:28:41 -0800 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-11-24 10:28:41 -0800 |
| commit | 82f3a34e17f82d894e6506d1451002a3b563fd8d (patch) | |
| tree | db422827f81f1c2215199cd764d18a9c8e71eb82 /indra/llaudio | |
| parent | d18e4c68843d524e871ffb24427a9df52dce1243 (diff) | |
| parent | d7d23d16246e182c1cc74a57cac357aaa5c6c8e2 (diff) | |
Merge
Diffstat (limited to 'indra/llaudio')
| -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 |