diff options
| author | angela <angela@lindenlab.com> | 2009-11-11 11:35:12 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-11 11:35:12 +0800 |
| commit | 68d6dffff38d5465c6458eac73985518389aaee7 (patch) | |
| tree | adfa7f5b43339741274ea513dfe5c8290bf39af6 /indra/newview/lltexturecache.cpp | |
| parent | 8ec85a68acee6b600320b10eea2b9aa11e434e83 (diff) | |
| parent | 1fb3bfea289f28094a7cbb59fe1cdaf9116988f0 (diff) | |
Automated merge with ssh://angela@hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 69a2d1d7a6..6a4b967487 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -1543,6 +1543,8 @@ bool LLTextureCache::readComplete(handle_t handle, bool abort) handle_map_t::iterator iter = mReaders.find(handle); llassert_always(iter != mReaders.end() || abort); LLTextureCacheWorker* worker = iter->second; + if (!worker) + return false; bool res = worker->complete(); if (res || abort) { |