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

diff --git a/indra/test/lltranscode_tut.cpp b/indra/test/lltranscode_tut.cpp
index 3fce6e0e2b..23d554d46d 100644
--- a/indra/test/lltranscode_tut.cpp
+++ b/indra/test/lltranscode_tut.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llscriptresource_tut.cpp
  * @brief Test LLScriptResource
  *
  * $LicenseInfo:firstyear=2008&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$
  */
@@ -38,49 +38,49 @@ static const char test_latin2[] = "Edelwei\xdf";
 
 namespace tut
 {
-	class LLTranscodeTestData
-	{
-	};
-	
-	typedef test_group<LLTranscodeTestData> LLTranscodeTestGroup;
-	typedef LLTranscodeTestGroup::object LLTranscodeTestObject;
-	LLTranscodeTestGroup transcodeTestGroup("transcode");
+    class LLTranscodeTestData
+    {
+    };
+
+    typedef test_group<LLTranscodeTestData> LLTranscodeTestGroup;
+    typedef LLTranscodeTestGroup::object LLTranscodeTestObject;
+    LLTranscodeTestGroup transcodeTestGroup("transcode");
+
+    template<> template<>
+    void LLTranscodeTestObject::test<1>()
+    {
+        // Test utf8
+        std::stringstream input;
+        std::stringstream output;
+
+        input.str(test_utf7);
+        output.clear();
+        LLTranscode::transcode("charset=UTF-7", input, output);
+        ensure_equals("UTF-7 to UTF-8 transcoding", output.str(),
+                          std::string(test_utf8));
+
+        input.str(test_latin1);
+        output.clear();
+        LLTranscode::transcode("", input, output);
+        ensure_equals("Default (latin_1) to UTF8 transcoding", output.str(),
+            std::string(test_utf8));
 
-	template<> template<>
-	void LLTranscodeTestObject::test<1>()
-	{
-		// Test utf8
-		std::stringstream input;
-		std::stringstream output;
+        input.str(test_latin1);
+        output.clear();
+        LLTranscode::transcode("charset=iso-8859-1", input, output);
+        ensure_equals("latin_1 (ISO-8859-1) to UTF8 transcoding", output.str(),
+            std::string(test_utf8));
 
-		input.str(test_utf7);
-		output.clear();
-		LLTranscode::transcode("charset=UTF-7", input, output);
-		ensure_equals("UTF-7 to UTF-8 transcoding", output.str(),
-						  std::string(test_utf8));
+        input.str(test_latin2);
+        output.clear();
+        LLTranscode::transcode("charset=iso-8859-2", input, output);
+        ensure_equals("latin_2 (ISO-8859-2) to UTF8 transcoding", output.str(),
+            std::string(test_utf8));
 
-		input.str(test_latin1);
-		output.clear();
-		LLTranscode::transcode("", input, output);
-		ensure_equals("Default (latin_1) to UTF8 transcoding", output.str(),
-			std::string(test_utf8));
-		
-		input.str(test_latin1);
-		output.clear();
-		LLTranscode::transcode("charset=iso-8859-1", input, output);
-		ensure_equals("latin_1 (ISO-8859-1) to UTF8 transcoding", output.str(),
-			std::string(test_utf8));
-	
-		input.str(test_latin2);
-		output.clear();
-		LLTranscode::transcode("charset=iso-8859-2", input, output);
-		ensure_equals("latin_2 (ISO-8859-2) to UTF8 transcoding", output.str(),
-			std::string(test_utf8));
-		
-		input.str(test_utf8);
-		output.clear();
-		LLTranscode::transcode("charset=utf-8", input, output);
-		ensure_equals("UTF8 to UTF8 transcoding", output.str(),
-			std::string(test_utf8));
-	}
+        input.str(test_utf8);
+        output.clear();
+        LLTranscode::transcode("charset=utf-8", input, output);
+        ensure_equals("UTF8 to UTF8 transcoding", output.str(),
+            std::string(test_utf8));
+    }
 }