diff options
author | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:55:57 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2021-07-19 15:55:57 -0600 |
commit | 4c849ba91363f82da05cce1221b04075a6ca72af (patch) | |
tree | 33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/llcorehttp/_httprequestqueue.cpp | |
parent | dc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff) | |
parent | be6066eae218856f7fd74b98968a75e5062fa830 (diff) |
Merge branch 'master' v 6.4.22 into DRTVWR-528
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; } } |