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

diff --git a/indra/llmessage/lltrustedmessageservice.cpp b/indra/llmessage/lltrustedmessageservice.cpp
index 33944f7883..4591a49dce 100644
--- a/indra/llmessage/lltrustedmessageservice.cpp
+++ b/indra/llmessage/lltrustedmessageservice.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$
  */
@@ -36,50 +36,50 @@
 bool LLTrustedMessageService::validate(const std::string& name, LLSD& context)
 const
 {
-	return true;
+    return true;
 }
 
 void LLTrustedMessageService::post(LLHTTPNode::ResponsePtr response,
-								   const LLSD& context,
-								   const LLSD& input) const
+                                   const LLSD& context,
+                                   const LLSD& input) const
 {
-	std::string name = context[CONTEXT_REQUEST][CONTEXT_WILDCARD]["message-name"];
-	std::string senderIP = context[CONTEXT_REQUEST][CONTEXT_REMOTE_HOST];
-	std::string senderPort = context[CONTEXT_REQUEST][CONTEXT_HEADERS]
-		["x-secondlife-udp-listen-port"];
+    std::string name = context[CONTEXT_REQUEST][CONTEXT_WILDCARD]["message-name"];
+    std::string senderIP = context[CONTEXT_REQUEST][CONTEXT_REMOTE_HOST];
+    std::string senderPort = context[CONTEXT_REQUEST][CONTEXT_HEADERS]
+        ["x-secondlife-udp-listen-port"];
+
+    LLSD message_data;
+    std::string sender = senderIP + ":" + senderPort;
+    message_data["sender"] = sender;
+    message_data["body"] = input;
 
-	LLSD message_data;
-	std::string sender = senderIP + ":" + senderPort;
-	message_data["sender"] = sender;
-	message_data["body"] = input;
-	
-	// untrusted senders should not have access to the trusted message
-	// service, but this can happen in development, so check and warn
-	LLMessageConfig::SenderTrust trust =
-		LLMessageConfig::getSenderTrustedness(name);
-	if ((trust == LLMessageConfig::TRUSTED ||
-		 (trust == LLMessageConfig::NOT_SET &&
-		  gMessageSystem->isTrustedMessage(name)))
-		 && !gMessageSystem->isTrustedSender(LLHost(sender)))
-	{
-		LL_WARNS("Messaging") << "trusted message POST to /trusted-message/" 
-				<< name << " from unknown or untrusted sender "
-				<< sender << LL_ENDL;
-		response->status(HTTP_FORBIDDEN, "Unknown or untrusted sender");
-	}
-	else
-	{
-		gMessageSystem->receivedMessageFromTrustedSender();
-		if (input.has("binary-template-data"))
-		{
-			LL_INFOS() << "Dispatching template: " << input << LL_ENDL;
-			// try and send this message using udp dispatch
-			LLMessageSystem::dispatchTemplate(name, message_data, response);
-		}
-		else
-		{
-			LL_INFOS() << "Dispatching without template: " << input << LL_ENDL;
-			LLMessageSystem::dispatch(name, message_data, response);
-		}
-	}
+    // untrusted senders should not have access to the trusted message
+    // service, but this can happen in development, so check and warn
+    LLMessageConfig::SenderTrust trust =
+        LLMessageConfig::getSenderTrustedness(name);
+    if ((trust == LLMessageConfig::TRUSTED ||
+         (trust == LLMessageConfig::NOT_SET &&
+          gMessageSystem->isTrustedMessage(name)))
+         && !gMessageSystem->isTrustedSender(LLHost(sender)))
+    {
+        LL_WARNS("Messaging") << "trusted message POST to /trusted-message/"
+                << name << " from unknown or untrusted sender "
+                << sender << LL_ENDL;
+        response->status(HTTP_FORBIDDEN, "Unknown or untrusted sender");
+    }
+    else
+    {
+        gMessageSystem->receivedMessageFromTrustedSender();
+        if (input.has("binary-template-data"))
+        {
+            LL_INFOS() << "Dispatching template: " << input << LL_ENDL;
+            // try and send this message using udp dispatch
+            LLMessageSystem::dispatchTemplate(name, message_data, response);
+        }
+        else
+        {
+            LL_INFOS() << "Dispatching without template: " << input << LL_ENDL;
+            LLMessageSystem::dispatch(name, message_data, response);
+        }
+    }
 }