summaryrefslogtreecommitdiff
path: root/indra/llcorehttp/_httprequestqueue.cpp
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2021-07-19 15:31:44 -0600
committerDave Houlton <euclid@lindenlab.com>2021-07-19 15:31:44 -0600
commitaa322d8eb4341c213a19cef87a887114c1ca278b (patch)
tree5ec6c6d42eaca354f58e21b926d9108e43367484 /indra/llcorehttp/_httprequestqueue.cpp
parent10f84d8244d01728338f1eb20b0b25271fc7db63 (diff)
parentbe6066eae218856f7fd74b98968a75e5062fa830 (diff)
Merge branch 'master' v 6.4.22 into DRTVWR-541
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;
}
}