diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-12-02 13:50:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-12-02 13:50:39 -0500 |
| commit | 5098ca5ae444ca492bc668fbd07976e96eb5726a (patch) | |
| tree | f392ec41ad1c3a44287dfff5efe6997962b9c4fc /indra/llaudio/llaudioengine.cpp | |
| parent | 37116479d299f23a289e39accc3899d6ea977203 (diff) | |
| parent | 6e62c6c410df9001b56ffd57c6c6d8cd9fe035e6 (diff) | |
merge fix for STORM-557
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 |