diff options
| author | angela <angela@lindenlab.com> | 2009-11-11 07:08:13 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-11 07:08:13 +0800 |
| commit | 33e1cae5cc93bbb32e955ca091feeff0ee3de041 (patch) | |
| tree | b2aed263a8ac5d31af9898f7d7bea143bf4b0734 /indra/newview/lltexturecache.cpp | |
| parent | 02943eca33a2cb5be39025557ca6e7aca30ea93a (diff) | |
| parent | 26d481f3850ded5a20e183260eced4c32c9b7a84 (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) { |