Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 22 insertions, 22 deletions

diff --git a/indra/llcorehttp/_httpreplyqueue.cpp b/indra/llcorehttp/_httpreplyqueue.cpp
index 229bfdbe07..6124bb6186 100644
--- a/indra/llcorehttp/_httpreplyqueue.cpp
+++ b/indra/llcorehttp/_httpreplyqueue.cpp
@@ -51,46 +51,46 @@ HttpReplyQueue::~HttpReplyQueue()
 
 void HttpReplyQueue::addOp(const HttpReplyQueue::opPtr_t &op)
 {
-	{
-		HttpScopedLock lock(mQueueMutex);
+    {
+        HttpScopedLock lock(mQueueMutex);
 
-		mQueue.push_back(op);
-	}
+        mQueue.push_back(op);
+    }
 }
 
 
 HttpReplyQueue::opPtr_t HttpReplyQueue::fetchOp()
 {
-	HttpOperation::ptr_t result;
+    HttpOperation::ptr_t result;
 
-	{
-		HttpScopedLock lock(mQueueMutex);
+    {
+        HttpScopedLock lock(mQueueMutex);
 
-		if (mQueue.empty())
+        if (mQueue.empty())
             return opPtr_t();
 
-		result = mQueue.front();
-		mQueue.erase(mQueue.begin());
-	}
+        result = mQueue.front();
+        mQueue.erase(mQueue.begin());
+    }
 
-	// Caller also acquires the reference count
-	return result;
+    // Caller also acquires the reference count
+    return result;
 }
 
 
 void HttpReplyQueue::fetchAll(OpContainer & ops)
 {
-	// Not valid putting something back on the queue...
-	llassert_always(ops.empty());
+    // Not valid putting something back on the queue...
+    llassert_always(ops.empty());
 
-	{
-		HttpScopedLock lock(mQueueMutex);
+    {
+        HttpScopedLock lock(mQueueMutex);
 
-		if (! mQueue.empty())
-		{
-			mQueue.swap(ops);
-		}
-	}
+        if (! mQueue.empty())
+        {
+            mQueue.swap(ops);
+        }
+    }
 }