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

diff --git a/indra/llmessage/tests/lltrustedmessageservice_test.cpp b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
index 41f982a7e2..cc199141b8 100644
--- a/indra/llmessage/tests/lltrustedmessageservice_test.cpp
+++ b/indra/llmessage/tests/lltrustedmessageservice_test.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -40,7 +40,7 @@ LLPounceable<LLMessageSystem*, LLPounceableStatic> gMessageSystem;
 LLMessageConfig::SenderTrust
 LLMessageConfig::getSenderTrustedness(const std::string& msg_name)
 {
-	return LLMessageConfig::NOT_SET;
+    return LLMessageConfig::NOT_SET;
 }
 
 void LLMessageSystem::receivedMessageFromTrustedSender()
@@ -49,12 +49,12 @@ void LLMessageSystem::receivedMessageFromTrustedSender()
 
 bool LLMessageSystem::isTrustedSender(const LLHost& host) const
 {
-	return false;
+    return false;
 }
 
 bool LLMessageSystem::isTrustedMessage(const std::string& name) const
 {
-	return false;
+    return false;
 }
 
 bool messageDispatched = false;
@@ -63,80 +63,80 @@ LLSD lastLLSD;
 std::string lastMessageName;
 
 void LLMessageSystem::dispatch(const std::string& msg_name,
-							   const LLSD& message,
-							   LLHTTPNode::ResponsePtr responsep)
+                               const LLSD& message,
+                               LLHTTPNode::ResponsePtr responsep)
 {
-	messageDispatched = true;
-	lastLLSD = message;
-	lastMessageName = msg_name;
+    messageDispatched = true;
+    lastLLSD = message;
+    lastMessageName = msg_name;
 }
 
 void LLMessageSystem::dispatchTemplate(const std::string& msg_name,
-						 const LLSD& message,
-						 LLHTTPNode::ResponsePtr responsep)
+                         const LLSD& message,
+                         LLHTTPNode::ResponsePtr responsep)
 {
-	lastLLSD = message;
-	lastMessageName = msg_name;
-	messageDispatchedAsBinary = true;
+    lastLLSD = message;
+    lastMessageName = msg_name;
+    messageDispatchedAsBinary = true;
 }
 
 namespace tut
 {
-	    struct LLTrustedMessageServiceData
-		{
-			LLTrustedMessageServiceData()
-			{
-				LLSD emptyLLSD;
-				lastLLSD = emptyLLSD;
-				lastMessageName = "uninitialised message name";
-				messageDispatched = false;
-				messageDispatchedAsBinary = false;
-			}
-		};
-
-	typedef test_group<LLTrustedMessageServiceData> factory;
-	typedef factory::object object;
+        struct LLTrustedMessageServiceData
+        {
+            LLTrustedMessageServiceData()
+            {
+                LLSD emptyLLSD;
+                lastLLSD = emptyLLSD;
+                lastMessageName = "uninitialised message name";
+                messageDispatched = false;
+                messageDispatchedAsBinary = false;
+            }
+        };
+
+    typedef test_group<LLTrustedMessageServiceData> factory;
+    typedef factory::object object;
 }
 
 namespace
 {
-	tut::factory tf("LLTrustedMessageServiceData");
+    tut::factory tf("LLTrustedMessageServiceData");
 }
 
 namespace tut
 {
-	// characterisation tests
-
-	// 1) test that messages get forwarded with names etc. as current behaviour (something like LLMessageSystem::dispatch(name, data...)
-
-	// test llsd messages are sent as normal using LLMessageSystem::dispatch() (eventually)
-	template<> template<>
-	void object::test<1>()
-	{
-		LLHTTPNode::ResponsePtr response;
-		LLSD input;
-		LLSD context;
-		LLTrustedMessageService adapter;
-		adapter.post(response, context, input);
-		// test original ting got called wit nowt, ya get me blood?
-		ensure_equals(messageDispatched, true);
-		ensure(lastLLSD.has("body"));
-	}
-
-	// test that llsd wrapped binary-template-data messages are 
-	// sent via LLMessageSystem::binaryDispatch() or similar
-	template<> template<>
-	void object::test<2>()
-	{
-		LLHTTPNode::ResponsePtr response;
-		LLSD input;
-		input["binary-template-data"] = "10001010110"; //make me a message here.
-		LLSD context;
-		LLTrustedMessageService adapter;
-
-		adapter.post(response, context, input);
-		ensure("check template-binary-data message was dispatched as binary", messageDispatchedAsBinary);
-		ensure_equals(lastLLSD["body"]["binary-template-data"].asString(),  "10001010110");
-		// test somit got called with "10001010110" (something like LLMessageSystem::dispatchTemplate(blah))
-	}
+    // characterisation tests
+
+    // 1) test that messages get forwarded with names etc. as current behaviour (something like LLMessageSystem::dispatch(name, data...)
+
+    // test llsd messages are sent as normal using LLMessageSystem::dispatch() (eventually)
+    template<> template<>
+    void object::test<1>()
+    {
+        LLHTTPNode::ResponsePtr response;
+        LLSD input;
+        LLSD context;
+        LLTrustedMessageService adapter;
+        adapter.post(response, context, input);
+        // test original ting got called wit nowt, ya get me blood?
+        ensure_equals(messageDispatched, true);
+        ensure(lastLLSD.has("body"));
+    }
+
+    // test that llsd wrapped binary-template-data messages are
+    // sent via LLMessageSystem::binaryDispatch() or similar
+    template<> template<>
+    void object::test<2>()
+    {
+        LLHTTPNode::ResponsePtr response;
+        LLSD input;
+        input["binary-template-data"] = "10001010110"; //make me a message here.
+        LLSD context;
+        LLTrustedMessageService adapter;
+
+        adapter.post(response, context, input);
+        ensure("check template-binary-data message was dispatched as binary", messageDispatchedAsBinary);
+        ensure_equals(lastLLSD["body"]["binary-template-data"].asString(),  "10001010110");
+        // test somit got called with "10001010110" (something like LLMessageSystem::dispatchTemplate(blah))
+    }
 }