From 97d2085735d7f73f00b09297c2eacdbd16941c03 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Tue, 13 Nov 2012 23:25:32 -0600 Subject: [PATCH] Nullcheck in LLTextureFetch::removeRequest was returning without unlocking LLTextureFetch::mQueueMutex if called via LLTextureFetch::deleteRequest --- indra/newview/lltexturefetch.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index 57ab3003f..ac57ff03b 100644 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -2168,11 +2168,13 @@ void LLTextureFetch::removeRequest(LLTextureFetchWorker* worker, bool cancel, bo { if(!worker) { + if(!bNeedsLock) + unlockQueue() ; return; } - if(bNeedsLock) lockQueue() ; + size_t erased_1 = mRequestMap.erase(worker->mID); unlockQueue() ;