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, 68 insertions, 68 deletions

diff --git a/indra/llcorehttp/tests/test_refcounted.hpp b/indra/llcorehttp/tests/test_refcounted.hpp
index 2310812d5a..c0c8e78413 100644
--- a/indra/llcorehttp/tests/test_refcounted.hpp
+++ b/indra/llcorehttp/tests/test_refcounted.hpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file test_refcounted.hpp
  * @brief unit tests for the LLCoreInt::RefCounted class
  *
@@ -34,93 +34,93 @@ using namespace LLCoreInt;
 
 namespace tut
 {
-	struct RefCountedTestData
-	{
-		// the test objects inherit from this so the member functions and variables
-		// can be referenced directly inside of the test functions.
-	};
+    struct RefCountedTestData
+    {
+        // the test objects inherit from this so the member functions and variables
+        // can be referenced directly inside of the test functions.
+    };
 
-	typedef test_group<RefCountedTestData> RefCountedTestGroupType;
-	typedef RefCountedTestGroupType::object RefCountedTestObjectType;
-	RefCountedTestGroupType RefCountedTestGroup("RefCounted Tests");
+    typedef test_group<RefCountedTestData> RefCountedTestGroupType;
+    typedef RefCountedTestGroupType::object RefCountedTestObjectType;
+    RefCountedTestGroupType RefCountedTestGroup("RefCounted Tests");
 
-	template <> template <>
-	void RefCountedTestObjectType::test<1>()
-	{
-		set_test_name("RefCounted construction with implicit count");
+    template <> template <>
+    void RefCountedTestObjectType::test<1>()
+    {
+        set_test_name("RefCounted construction with implicit count");
 
-		// create a new ref counted object with an implicit reference
-		RefCounted * rc = new RefCounted(true);
-		ensure(rc->getRefCount() == 1);
+        // create a new ref counted object with an implicit reference
+        RefCounted * rc = new RefCounted(true);
+        ensure(rc->getRefCount() == 1);
 
-		// release the implicit reference, causing the object to be released
-		rc->release();
-	}
+        // release the implicit reference, causing the object to be released
+        rc->release();
+    }
 
-	template <> template <>
-	void RefCountedTestObjectType::test<2>()
-	{
-		set_test_name("RefCounted construction without implicit count");
+    template <> template <>
+    void RefCountedTestObjectType::test<2>()
+    {
+        set_test_name("RefCounted construction without implicit count");
 
-		// create a new ref counted object with an implicit reference
-		RefCounted * rc = new RefCounted(false);
-		ensure(rc->getRefCount() == 0);
+        // create a new ref counted object with an implicit reference
+        RefCounted * rc = new RefCounted(false);
+        ensure(rc->getRefCount() == 0);
 
-		// add a reference
-		rc->addRef();
-		ensure(rc->getRefCount() == 1);
+        // add a reference
+        rc->addRef();
+        ensure(rc->getRefCount() == 1);
 
-		// release the implicit reference, causing the object to be released
-		rc->release();
-	}
+        // release the implicit reference, causing the object to be released
+        rc->release();
+    }
 
-	template <> template <>
-	void RefCountedTestObjectType::test<3>()
-	{
-		set_test_name("RefCounted addRef and release");
+    template <> template <>
+    void RefCountedTestObjectType::test<3>()
+    {
+        set_test_name("RefCounted addRef and release");
 
-		RefCounted * rc = new RefCounted(false);
+        RefCounted * rc = new RefCounted(false);
 
-		for (int i = 0; i < 1024; ++i)
-		{
-			rc->addRef();
-		}
+        for (int i = 0; i < 1024; ++i)
+        {
+            rc->addRef();
+        }
 
-		ensure(rc->getRefCount() == 1024);
+        ensure(rc->getRefCount() == 1024);
 
-		for (int i = 0; i < 1024; ++i)
-		{
-			rc->release();
-		}
-	}
+        for (int i = 0; i < 1024; ++i)
+        {
+            rc->release();
+        }
+    }
 
-	template <> template <>
-	void RefCountedTestObjectType::test<4>()
-	{
-		set_test_name("RefCounted isLastRef check");
+    template <> template <>
+    void RefCountedTestObjectType::test<4>()
+    {
+        set_test_name("RefCounted isLastRef check");
 
-		RefCounted * rc = new RefCounted(true);
+        RefCounted * rc = new RefCounted(true);
 
-		// with only one reference, isLastRef should be true
-		ensure(rc->isLastRef());
+        // with only one reference, isLastRef should be true
+        ensure(rc->isLastRef());
 
-		// release it to clean up memory
-		rc->release();
-	}
+        // release it to clean up memory
+        rc->release();
+    }
 
-	template <> template <>
-	void RefCountedTestObjectType::test<5>()
-	{
-		set_test_name("RefCounted noRef check");
+    template <> template <>
+    void RefCountedTestObjectType::test<5>()
+    {
+        set_test_name("RefCounted noRef check");
 
-		RefCounted * rc = new RefCounted(false);
+        RefCounted * rc = new RefCounted(false);
 
-		// set the noRef
-		rc->noRef();
+        // set the noRef
+        rc->noRef();
 
-		// with only one reference, isLastRef should be true
-		ensure(rc->getRefCount() == RefCounted::NOT_REF_COUNTED);
-	}
+        // with only one reference, isLastRef should be true
+        ensure(rc->getRefCount() == RefCounted::NOT_REF_COUNTED);
+    }
 }
 #endif  // disabling on Win64
-#endif	// TEST_LLCOREINT_REF_COUNTED_H_
+#endif  // TEST_LLCOREINT_REF_COUNTED_H_