diff options
author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-20 00:57:39 +0300 |
---|---|---|
committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-07-20 00:58:09 +0300 |
commit | b8d846f0eda7edc45fda3c311f0f5864801ed0f5 (patch) | |
tree | a8a1c8b5c5b0117dbff0ed187a72e7c8599745bb /indra/llcorehttp/_httprequestqueue.cpp | |
parent | a5675bedbb2bd34ce03dd16651dc74d8078efea9 (diff) | |
parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) |
Merge master (DRTVWR-516) into DRTVWR-542-meshopt
Diffstat (limited to 'indra/llcorehttp/_httprequestqueue.cpp')
-rw-r--r-- | indra/llcorehttp/_httprequestqueue.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/llcorehttp/_httprequestqueue.cpp b/indra/llcorehttp/_httprequestqueue.cpp index c6f4ad789f..ad72bdcce6 100644 --- a/indra/llcorehttp/_httprequestqueue.cpp +++ b/indra/llcorehttp/_httprequestqueue.cpp @@ -142,13 +142,19 @@ void HttpRequestQueue::wakeAll() } -void HttpRequestQueue::stopQueue() +bool HttpRequestQueue::stopQueue() { { HttpScopedLock lock(mQueueMutex); - mQueueStopped = true; - wakeAll(); + if (!mQueueStopped) + { + mQueueStopped = true; + wakeAll(); + return true; + } + wakeAll(); + return false; } } |