diff options
author | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2009-11-11 10:44:39 -0500 |
commit | 652c8f6b5e91e1333854ac5e300b0bf650d03fc2 (patch) | |
tree | 4c0375dddbf315baa73c30fe648eb0915f3e3f2a /indra/newview/lltexturecache.cpp | |
parent | af9b99b457a6a6ab9f04a20bcde6a90091321375 (diff) | |
parent | 062d0a13db505636b186084d42c527a49637f380 (diff) |
merge
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) { |