aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--linden/doc/contributions.txt2
-rw-r--r--linden/indra/newview/lltexturefetch.cpp6
2 files changed, 7 insertions, 1 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 253c157..a1ec128 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -577,6 +577,8 @@ Tue Torok
577 CT-74 577 CT-74
578Vadim Bigbear 578Vadim Bigbear
579 VWR-2681 579 VWR-2681
580Vex Streeter
581 SNOW-434
580Vixen Heron 582Vixen Heron
581 VWR-2710 583 VWR-2710
582 CT-88 584 CT-88
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)
1472// protected 1472// protected
1473void LLTextureFetch::addToNetworkQueue(LLTextureFetchWorker* worker) 1473void LLTextureFetch::addToNetworkQueue(LLTextureFetchWorker* worker)
1474{ 1474{
1475 mQueueMutex.lock();
1476 bool is_worker_in_request_map = (mRequestMap.find(worker->mID) != mRequestMap.end());
1477 mQueueMutex.unlock();
1478
1475 LLMutexLock lock(&mNetworkQueueMutex); 1479 LLMutexLock lock(&mNetworkQueueMutex);
1476 if (mRequestMap.find(worker->mID) != mRequestMap.end()) 1480 if (is_worker_in_request_map)
1477 { 1481 {
1478 // only add to the queue if in the request map 1482 // only add to the queue if in the request map
1479 // i.e. a delete has not been requested 1483 // i.e. a delete has not been requested