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

diff --git a/indra/newview/tests/lltexturestatsuploader_test.cpp b/indra/newview/tests/lltexturestatsuploader_test.cpp
index 4438523022..782a4892b9 100644
--- a/indra/newview/tests/lltexturestatsuploader_test.cpp
+++ b/indra/newview/tests/lltexturestatsuploader_test.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lltexturestatsuploader_test.cpp
  * @author Si
  * @date 2009-05-27
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2006&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -36,7 +36,7 @@
 
 // -------------------------------------------------------------------------------------------
 // Stubbing: Declarations required to link and run the class being tested
-// Notes: 
+// Notes:
 // * Add here stubbed implementation of the few classes and methods used in the class to be tested
 // * Add as little as possible (let the link errors guide you)
 // * Do not make any assumption as to how those classes or methods work (i.e. don't copy/paste code)
@@ -51,16 +51,16 @@ static std::string most_recent_url;
 static LLSD most_recent_body;
 
 void LLHTTPClient::post(
-		const std::string& url,
-		const LLSD& body,
-		ResponderPtr,
-		const LLSD& headers,
-		const F32 timeout)
+        const std::string& url,
+        const LLSD& body,
+        ResponderPtr,
+        const LLSD& headers,
+        const F32 timeout)
 {
-	// set some sensor code
-	most_recent_url = url;
-	most_recent_body = body;
-	return;
+    // set some sensor code
+    most_recent_url = url;
+    most_recent_body = body;
+    return;
 }
 
 // End Stubbing
@@ -72,79 +72,79 @@ void LLHTTPClient::post(
 
 namespace tut
 {
-	// Test wrapper declarations
-	struct texturestatsuploader_test
-	{
-		// Constructor and destructor of the test wrapper
-		texturestatsuploader_test()
-		{
-			most_recent_url = "some sort of default text that should never match anything the tests are expecting!";
-			LLSD blank_llsd;
-			most_recent_body = blank_llsd;
-		}
-		~texturestatsuploader_test()
-		{
-		}
-	};
+    // Test wrapper declarations
+    struct texturestatsuploader_test
+    {
+        // Constructor and destructor of the test wrapper
+        texturestatsuploader_test()
+        {
+            most_recent_url = "some sort of default text that should never match anything the tests are expecting!";
+            LLSD blank_llsd;
+            most_recent_body = blank_llsd;
+        }
+        ~texturestatsuploader_test()
+        {
+        }
+    };
+
+    // Tut templating thingamagic: test group, object and test instance
+    typedef test_group<texturestatsuploader_test> texturestatsuploader_t;
+    typedef texturestatsuploader_t::object texturestatsuploader_object_t;
+    tut::texturestatsuploader_t tut_texturestatsuploader("LLTextureStatsUploader");
+
 
-	// Tut templating thingamagic: test group, object and test instance
-	typedef test_group<texturestatsuploader_test> texturestatsuploader_t;
-	typedef texturestatsuploader_t::object texturestatsuploader_object_t;
-	tut::texturestatsuploader_t tut_texturestatsuploader("LLTextureStatsUploader");
+    // ---------------------------------------------------------------------------------------
+    // Test functions
+    // Notes:
+    // * Test as many as you possibly can without requiring a full blown simulation of everything
+    // * The tests are executed in sequence so the test instance state may change between calls
+    // * Remember that you cannot test private methods with tut
+    // ---------------------------------------------------------------------------------------
 
-	
-	// ---------------------------------------------------------------------------------------
-	// Test functions
-	// Notes:
-	// * Test as many as you possibly can without requiring a full blown simulation of everything
-	// * The tests are executed in sequence so the test instance state may change between calls
-	// * Remember that you cannot test private methods with tut
-	// ---------------------------------------------------------------------------------------
+    // ---------------------------------------------------------------------------------------
+    // Test the LLTextureInfo
+    // ---------------------------------------------------------------------------------------
 
-	// ---------------------------------------------------------------------------------------
-	// Test the LLTextureInfo
-	// ---------------------------------------------------------------------------------------
 
+    // Test instantiation
+    template<> template<>
+    void texturestatsuploader_object_t::test<1>()
+    {
+        LLTextureStatsUploader tsu;
+        LL_INFOS() << &tsu << LL_ENDL;
+        ensure("have we crashed?", true);
+    }
 
-	// Test instantiation
-	template<> template<>
-	void texturestatsuploader_object_t::test<1>()
-	{
-		LLTextureStatsUploader tsu;
-		LL_INFOS() << &tsu << LL_ENDL;
-		ensure("have we crashed?", true);
-	}
+    // does it call out to the provided url if we ask it to?
+    template<> template<>
+    void texturestatsuploader_object_t::test<2>()
+    {
+        LLTextureStatsUploader tsu;
+        std::string url = "http://blahblahblah";
+        LLSD texture_stats;
+        tsu.uploadStatsToSimulator(url, texture_stats);
+        ensure_equals("did the right url get called?", most_recent_url, url);
+        ensure_equals("did the right body get sent?", most_recent_body, texture_stats);
+    }
 
-	// does it call out to the provided url if we ask it to?
-	template<> template<>
-	void texturestatsuploader_object_t::test<2>()
-	{	
-		LLTextureStatsUploader tsu;
-		std::string url = "http://blahblahblah";
-		LLSD texture_stats;
-		tsu.uploadStatsToSimulator(url, texture_stats);
-		ensure_equals("did the right url get called?", most_recent_url, url);
-		ensure_equals("did the right body get sent?", most_recent_body, texture_stats);
-	}
+    // does it not call out to the provided url if we send it an ungranted cap?
+    template<> template<>
+    void texturestatsuploader_object_t::test<3>()
+    {
+        LLTextureStatsUploader tsu;
 
-	// does it not call out to the provided url if we send it an ungranted cap?
-	template<> template<>
-	void texturestatsuploader_object_t::test<3>()
-	{	
-		LLTextureStatsUploader tsu;
+        // this url left intentionally blank to mirror
+        // not getting a cap in the caller.
+        std::string url_for_ungranted_cap = "";
 
-		// this url left intentionally blank to mirror
-		// not getting a cap in the caller.
-		std::string url_for_ungranted_cap = ""; 
-							  
-		LLSD texture_stats;
-		std::string most_recent_url_before_test = most_recent_url;
-		tsu.uploadStatsToSimulator(url_for_ungranted_cap, texture_stats);
+        LLSD texture_stats;
+        std::string most_recent_url_before_test = most_recent_url;
+        tsu.uploadStatsToSimulator(url_for_ungranted_cap, texture_stats);
 
-		ensure_equals("hopefully no url got called!", most_recent_url, most_recent_url_before_test);
-	}
+        ensure_equals("hopefully no url got called!", most_recent_url, most_recent_url_before_test);
+    }
 
-	// does it call out if the data is empty?
-	// should it even do that?
+    // does it call out if the data is empty?
+    // should it even do that?
 }