Merge with tip of Master after a Viewer release

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;
 	}
 }