summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturecache.cpp
diff options
context:
space:
mode:
authorVadim Savchuk <vsavchuk@productengine.com>2009-11-11 17:47:20 +0200
committerVadim Savchuk <vsavchuk@productengine.com>2009-11-11 17:47:20 +0200
commit6146cfc5c1c14f106b54b7394db6286d9b7bb67a (patch)
treef29e14c852a36d1b97defd0f126068deec8ed3b6 /indra/newview/lltexturecache.cpp
parent61fdd33f7916dbf13c5c56e2d4c0ccb14fdae150 (diff)
parent062d0a13db505636b186084d42c527a49637f380 (diff)
Merge from default branch
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
-rw-r--r--indra/newview/lltexturecache.cpp2
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)
{