Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 62 insertions, 62 deletions

diff --git a/indra/llcorehttp/tests/test_httprequestqueue.hpp b/indra/llcorehttp/tests/test_httprequestqueue.hpp
index dba9e0b250..c6fa1b7534 100644
--- a/indra/llcorehttp/tests/test_httprequestqueue.hpp
+++ b/indra/llcorehttp/tests/test_httprequestqueue.hpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file test_httprequestqueue.hpp
  * @brief unit tests for the LLCore::HttpRequestQueue class
  *
@@ -42,8 +42,8 @@ namespace tut
 
 struct HttpRequestqueueTestData
 {
-	// the test objects inherit from this so the member functions and variables
-	// can be referenced directly inside of the test functions.
+    // the test objects inherit from this so the member functions and variables
+    // can be referenced directly inside of the test functions.
 };
 
 typedef test_group<HttpRequestqueueTestData> HttpRequestqueueTestGroupType;
@@ -53,102 +53,102 @@ HttpRequestqueueTestGroupType HttpRequestqueueTestGroup("HttpRequestqueue Tests"
 template <> template <>
 void HttpRequestqueueTestObjectType::test<1>()
 {
-	set_test_name("HttpRequestQueue construction");
+    set_test_name("HttpRequestQueue construction");
 
-	// create a new ref counted object with an implicit reference
-	HttpRequestQueue::init();
-	
-	ensure("One ref on construction of HttpRequestQueue", HttpRequestQueue::instanceOf()->getRefCount() == 1);
+    // create a new ref counted object with an implicit reference
+    HttpRequestQueue::init();
 
-	// release the implicit reference, causing the object to be released
-	HttpRequestQueue::term();
+    ensure("One ref on construction of HttpRequestQueue", HttpRequestQueue::instanceOf()->getRefCount() == 1);
+
+    // release the implicit reference, causing the object to be released
+    HttpRequestQueue::term();
 }
 
 template <> template <>
 void HttpRequestqueueTestObjectType::test<2>()
 {
-	set_test_name("HttpRequestQueue refcount works");
+    set_test_name("HttpRequestQueue refcount works");
+
+    // create a new ref counted object with an implicit reference
+    HttpRequestQueue::init();
+
+    HttpRequestQueue * rq = HttpRequestQueue::instanceOf();
+    rq->addRef();
 
-	// create a new ref counted object with an implicit reference
-	HttpRequestQueue::init();
+    // release the singleton, hold on to the object
+    HttpRequestQueue::term();
 
-	HttpRequestQueue * rq = HttpRequestQueue::instanceOf();
-	rq->addRef();
-	
-	// release the singleton, hold on to the object
-	HttpRequestQueue::term();
-	
-	ensure("One ref after term() called", rq->getRefCount() == 1);
+    ensure("One ref after term() called", rq->getRefCount() == 1);
 
-	// Drop ref
-	rq->release();
+    // Drop ref
+    rq->release();
 }
 
 template <> template <>
 void HttpRequestqueueTestObjectType::test<3>()
 {
-	set_test_name("HttpRequestQueue addOp/fetchOp work");
+    set_test_name("HttpRequestQueue addOp/fetchOp work");
 
-	// create a new ref counted object with an implicit reference
-	HttpRequestQueue::init();
+    // create a new ref counted object with an implicit reference
+    HttpRequestQueue::init();
 
-	HttpRequestQueue * rq = HttpRequestQueue::instanceOf();
+    HttpRequestQueue * rq = HttpRequestQueue::instanceOf();
 
-	HttpOperation::ptr_t op(new HttpOpNull());
+    HttpOperation::ptr_t op(new HttpOpNull());
 
-	rq->addOp(op);		// transfer my refcount
+    rq->addOp(op);      // transfer my refcount
 
-	op = rq->fetchOp(true);		// Potentially hangs the test on failure
-	ensure("One goes in, one comes out", static_cast<bool>(op));
+    op = rq->fetchOp(true);     // Potentially hangs the test on failure
+    ensure("One goes in, one comes out", static_cast<bool>(op));
     op.reset();
 
-	op = rq->fetchOp(false);
-	ensure("Better not be two of them", !op);
-	
-	// release the singleton, hold on to the object
-	HttpRequestQueue::term();
+    op = rq->fetchOp(false);
+    ensure("Better not be two of them", !op);
+
+    // release the singleton, hold on to the object
+    HttpRequestQueue::term();
 }
 
 template <> template <>
 void HttpRequestqueueTestObjectType::test<4>()
 {
-	set_test_name("HttpRequestQueue addOp/fetchAll work");
+    set_test_name("HttpRequestQueue addOp/fetchAll work");
+
+    // create a new ref counted object with an implicit reference
+    HttpRequestQueue::init();
 
-	// create a new ref counted object with an implicit reference
-	HttpRequestQueue::init();
+    HttpRequestQueue * rq = HttpRequestQueue::instanceOf();
 
-	HttpRequestQueue * rq = HttpRequestQueue::instanceOf();
+    HttpOperation::ptr_t op (new HttpOpNull());
+    rq->addOp(op);      // transfer my refcount
 
-	HttpOperation::ptr_t op (new HttpOpNull());
-	rq->addOp(op);		// transfer my refcount
+    op.reset(new HttpOpNull());
+    rq->addOp(op);      // transfer my refcount
 
-	op.reset(new HttpOpNull());
-	rq->addOp(op);		// transfer my refcount
+    op.reset(new HttpOpNull());
+    rq->addOp(op);      // transfer my refcount
 
-	op.reset(new HttpOpNull());
-	rq->addOp(op);		// transfer my refcount
-	
-	{
-		HttpRequestQueue::OpContainer ops;
-		rq->fetchAll(true, ops);		// Potentially hangs the test on failure
-		ensure("Three go in, three come out", 3 == ops.size());
+    {
+        HttpRequestQueue::OpContainer ops;
+        rq->fetchAll(true, ops);        // Potentially hangs the test on failure
+        ensure("Three go in, three come out", 3 == ops.size());
 
-		op = rq->fetchOp(false);
-		ensure("Better not be any more of them", !op);
+        op = rq->fetchOp(false);
+        ensure("Better not be any more of them", !op);
         op.reset();
 
-		// release the singleton, hold on to the object
-		HttpRequestQueue::term();
+        // release the singleton, hold on to the object
+        HttpRequestQueue::term();
 
-		// Release them
+        // Release them
         ops.clear();
-// 		while (! ops.empty())
-// 		{
-// 			HttpOperation * op = ops.front();
-// 			ops.erase(ops.begin());
-// 			op->release();
-// 		}
-	}
+//      while (! ops.empty())
+//      {
+//          HttpOperation * op = ops.front();
+//          ops.erase(ops.begin());
+//          op->release();
+//      }
+    }
 }
 
 }  // end namespace tut