Vex Streeter, Merov Linden: SNOW-434 Unsafe threaded op. (lltexturefetch.cpp).

1 files changed, 5 insertions, 1 deletions

diff --git a/linden/indra/newview/lltexturefetch.cpp b/linden/indra/newview/lltexturefetch.cpp
index 935b8cc..8ff9e9f 100644
--- a/linden/indra/newview/lltexturefetch.cpp
+++ b/linden/indra/newview/lltexturefetch.cpp
@@ -1472,8 +1472,12 @@ void LLTextureFetch::deleteRequest(const LLUUID& id, bool cancel)
 // protected
 void LLTextureFetch::addToNetworkQueue(LLTextureFetchWorker* worker)
 {
+        mQueueMutex.lock();
+        bool is_worker_in_request_map = (mRequestMap.find(worker->mID) != mRequestMap.end());
+        mQueueMutex.unlock();
+
         LLMutexLock lock(&mNetworkQueueMutex);
-        if (mRequestMap.find(worker->mID) != mRequestMap.end())
+        if (is_worker_in_request_map)
         {
                 // only add to the queue if in the request map
                 // i.e. a delete has not been requested