diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-03-04 15:02:30 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-03-04 15:02:30 -0700 |
| commit | b0d4919fd453fea9afc1cc0745140e83992997b6 (patch) | |
| tree | 4a249ec99652a6041a9599b6415a44539e4c0f50 /indra/newview/lltexturecache.cpp | |
| parent | 60fde8d512cfe7456ad5756c22f8bd9284c0c14e (diff) | |
fix for EXT-5683: viewer crashes at llcommon/llworkerthread.cpp(323): ERROR: LLWorkerClass::checkWork: ASSERT(workreq).
Diffstat (limited to 'indra/newview/lltexturecache.cpp')
| -rw-r--r-- | indra/newview/lltexturecache.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 91c303c79e..3116c8feb0 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -750,6 +750,7 @@ LLTextureCache::LLTextureCache(bool threaded) LLTextureCache::~LLTextureCache() { + clearDeleteList() ; } ////////////////////////////////////////////////////////////////////////////// @@ -1574,6 +1575,11 @@ bool LLTextureCache::readComplete(handle_t handle, bool abort) { worker = iter->second; complete = worker->complete(); + + if(!complete && abort) + { + abortRequest(handle, true) ; + } } if (worker && (complete || abort)) { |