summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/_httprequestqueue.cpp
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-07-19 22:24:33 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-07-19 22:24:33 +0000
commit1b15b8cda7853e55a91fd0140311ed69f3cca677 (patch)
tree33edfb0495161594a50dcfbed3a3f42e7fde9143 /indra/llcorehttp/_httprequestqueue.cpp
parentdc14dbf54d332a6cdc43002bb71ed71e9a473647 (diff)
parent4c849ba91363f82da05cce1221b04075a6ca72af (diff)
Merged in DV528-merge-6.4.22 (pull request #630)
DRTVWR-528 merge up to v 6.4.22
Diffstat (limited to 'indra/llcorehttp/_httprequestqueue.cpp')
-rw-r--r--indra/llcorehttp/_httprequestqueue.cpp12
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;
}
}