diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2010-03-05 09:15:18 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2010-03-05 09:15:18 -0700 |
| commit | d33b6a18872a652808afe3aa9ae40de6adaa3004 (patch) | |
| tree | 6ea0bd6d39110f8cbf8a71c0806c5ca7dfa7f9fc /indra/newview/lltexturecache.cpp | |
| parent | f7ad793e54a0dc4bec53e6ac56b15bb8115620a1 (diff) | |
| parent | b0d4919fd453fea9afc1cc0745140e83992997b6 (diff) | |
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
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)) { |