From 1cb75c44718a586add2757f3b33a82001106df70 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Fri, 9 Nov 2012 18:42:37 -0600
Subject: [PATCH] Tiny bit of code consolidation in lltexturefetch

---
 indra/newview/lltexturefetch.cpp | 26 +++++++++-----------------
 indra/newview/lltexturefetch.h   |  2 +-
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp
index 2a4abcf1b..1bed70bf2 100644
--- a/indra/newview/lltexturefetch.cpp
+++ b/indra/newview/lltexturefetch.cpp
@@ -2160,27 +2160,19 @@ void LLTextureFetch::deleteRequest(const LLUUID& id, bool cancel)
 {
 	lockQueue() ;
 	LLTextureFetchWorker* worker = getWorkerAfterLock(id);
-	if (worker)
-	{		
-		size_t erased_1 = mRequestMap.erase(worker->mID);
-		unlockQueue() ;
 
-		llassert_always(erased_1 > 0) ;
-
-		removeFromNetworkQueue(worker, cancel);
-		llassert_always(!(worker->getFlags(LLWorkerClass::WCF_DELETE_REQUESTED))) ;
-
-		worker->scheduleDelete();	
-	}
-	else
-	{
-		unlockQueue() ;
-	}
+	removeRequest(worker, cancel, false);
 }
 
-void LLTextureFetch::removeRequest(LLTextureFetchWorker* worker, bool cancel)
+void LLTextureFetch::removeRequest(LLTextureFetchWorker* worker, bool cancel, bool bNeedsLock)
 {
-	lockQueue() ;
+	if(!worker)
+	{
+		return;
+	}
+	
+	if(bNeedsLock)
+		lockQueue() ;
 	size_t erased_1 = mRequestMap.erase(worker->mID);
 	unlockQueue() ;
 
diff --git a/indra/newview/lltexturefetch.h b/indra/newview/lltexturefetch.h
index 03073d906..176ba31db 100644
--- a/indra/newview/lltexturefetch.h
+++ b/indra/newview/lltexturefetch.h
@@ -121,7 +121,7 @@ protected:
 	void removeFromNetworkQueue(LLTextureFetchWorker* worker, bool cancel);
 	void addToHTTPQueue(const LLUUID& id);
 	void removeFromHTTPQueue(const LLUUID& id, S32 received_size = 0);
-	void removeRequest(LLTextureFetchWorker* worker, bool cancel);
+	void removeRequest(LLTextureFetchWorker* worker, bool cancel, bool bNeedsLock = true);
 
 	// Overrides from the LLThread tree
 	bool runCondition();