diff options
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/lltexturefetch.cpp | 6 |
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) | |||
| 1472 | // protected | 1472 | // protected |
| 1473 | void LLTextureFetch::addToNetworkQueue(LLTextureFetchWorker* worker) | 1473 | void 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 |