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

diff --git a/indra/test/llservicebuilder_tut.cpp b/indra/test/llservicebuilder_tut.cpp
index 8f5be3011c..0bc17865d6 100644
--- a/indra/test/llservicebuilder_tut.cpp
+++ b/indra/test/llservicebuilder_tut.cpp
@@ -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$
 */
@@ -35,139 +35,139 @@
 namespace tut
 {
 
-	struct ServiceBuilderTestData {
-		LLServiceBuilder mServiceBuilder;
-	};
-
-	typedef test_group<ServiceBuilderTestData>	ServiceBuilderTestGroup;
-	typedef ServiceBuilderTestGroup::object	ServiceBuilderTestObject;
-
-	ServiceBuilderTestGroup serviceBuilderTestGroup("ServiceBuilder");
-
-	template<> template<>
-	void ServiceBuilderTestObject::test<1>()
-	{
-		//Simple service build and reply with no mapping
-		LLSD test_block;
-		test_block["service-builder"] = "/agent/name";
-		mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);
-		std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilderTest");
-		ensure_equals("Basic URL Creation", test_url , "/agent/name");
-	}	
-
-	template<> template<>
-	void ServiceBuilderTestObject::test<2>()
-	{
-		//Simple replace test
-		LLSD test_block;
-		test_block["service-builder"] = "/agent/{$agent-id}/name";
-		mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);	
-		LLSD data_map;
-		data_map["agent-id"] = "257c631f-a0c5-4f29-8a9f-9031feaae6c6";
-		std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilderTest", data_map);
-		ensure_equals("Replacement URL Creation", test_url , "/agent/257c631f-a0c5-4f29-8a9f-9031feaae6c6/name");
-	}	
-
-	template<> template<>
-	void ServiceBuilderTestObject::test<3>()
-	{
-		//Incorrect service test
-		LLSD test_block;
-		test_block["service-builder"] = "/agent/{$agent-id}/name";
-		mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);	
-		std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilder");
-		ensure_equals("Replacement URL Creation for Non-existant Service", test_url , "");
-	}
-
-	template<> template<>
-	void ServiceBuilderTestObject::test<4>()
-	{
-		//Incorrect service test
-		LLSD test_block;
-		test_block["service-builder"] = "/agent/{$agent-id}/name";
-		mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);
-		LLSD data_map;
-		data_map["agent_id"] = "257c631f-a0c5-4f29-8a9f-9031feaae6c6";
-		std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilderTest", data_map);
-		ensure_equals("Replacement URL Creation for Non-existant Service", test_url , "/agent/{$agent-id}/name");
-	}
-
-	template<> template<>
-	void ServiceBuilderTestObject::test<5>()
-	{
-		LLSD test_block;
-		test_block["service-builder"] = "/proc/{$proc}{%params}";
-		mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);	
-		LLSD data_map;
-		data_map["proc"] = "do/something/useful";
-		data_map["params"]["estate_id"] = 1;
-		data_map["params"]["query"] = "public";
-		std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilderTest", data_map);
-		ensure_equals(
-			"two part URL Creation",
-			test_url ,
-			"/proc/do/something/useful?estate_id=1&query=public");
-	}
-
-	template<> template<>
-	void ServiceBuilderTestObject::test<6>()
-	{
-		LLSD test_block;
-		test_block["service-builder"] = "Which way to the {${$baz}}?";
-		mServiceBuilder.createServiceDefinition(
-			"ServiceBuilderTest",
-			test_block["service-builder"]);	
-
-		LLSD data_map;
-		data_map["foo"] = "bar";
-		data_map["baz"] = "foo";
-		std::string test_url = mServiceBuilder.buildServiceURI(
-			"ServiceBuilderTest",
-			data_map);
-		ensure_equals(
-			"recursive url creation",
-			test_url ,
-			"Which way to the bar?");
-	}
-
-	template<> template<>
-	void ServiceBuilderTestObject::test<7>()
-	{
-		LLSD test_block;
-		test_block["service-builder"] = "Which way to the {$foo}?";
-		mServiceBuilder.createServiceDefinition(
-			"ServiceBuilderTest",
-			test_block["service-builder"]);	
-
-		LLSD data_map;
-		data_map["baz"] = "foo";
-		std::string test_url = mServiceBuilder.buildServiceURI(
-			"ServiceBuilderTest",
-			data_map);
-		ensure_equals(
-			"fails to do replacement",
-			test_url ,
-			"Which way to the {$foo}?");
-	}
-
-	template<> template<>
-	void ServiceBuilderTestObject::test<8>()
-	{
-		LLSD test_block;
-		test_block["service-builder"] = "/proc/{$proc}{%params}";
-		mServiceBuilder.createServiceDefinition(
-			"ServiceBuilderTest",
-			test_block["service-builder"]);	
-		LLSD data_map;
-		data_map["proc"] = "do/something/useful";
-		data_map["params"] = LLSD();
-		std::string test_url = mServiceBuilder.buildServiceURI(
-			"ServiceBuilderTest",
-			data_map);
-		ensure_equals(
-			"strip params",
-			test_url ,
-			"/proc/do/something/useful");
-	}
+    struct ServiceBuilderTestData {
+        LLServiceBuilder mServiceBuilder;
+    };
+
+    typedef test_group<ServiceBuilderTestData>  ServiceBuilderTestGroup;
+    typedef ServiceBuilderTestGroup::object ServiceBuilderTestObject;
+
+    ServiceBuilderTestGroup serviceBuilderTestGroup("ServiceBuilder");
+
+    template<> template<>
+    void ServiceBuilderTestObject::test<1>()
+    {
+        //Simple service build and reply with no mapping
+        LLSD test_block;
+        test_block["service-builder"] = "/agent/name";
+        mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);
+        std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilderTest");
+        ensure_equals("Basic URL Creation", test_url , "/agent/name");
+    }
+
+    template<> template<>
+    void ServiceBuilderTestObject::test<2>()
+    {
+        //Simple replace test
+        LLSD test_block;
+        test_block["service-builder"] = "/agent/{$agent-id}/name";
+        mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);
+        LLSD data_map;
+        data_map["agent-id"] = "257c631f-a0c5-4f29-8a9f-9031feaae6c6";
+        std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilderTest", data_map);
+        ensure_equals("Replacement URL Creation", test_url , "/agent/257c631f-a0c5-4f29-8a9f-9031feaae6c6/name");
+    }
+
+    template<> template<>
+    void ServiceBuilderTestObject::test<3>()
+    {
+        //Incorrect service test
+        LLSD test_block;
+        test_block["service-builder"] = "/agent/{$agent-id}/name";
+        mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);
+        std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilder");
+        ensure_equals("Replacement URL Creation for Non-existant Service", test_url , "");
+    }
+
+    template<> template<>
+    void ServiceBuilderTestObject::test<4>()
+    {
+        //Incorrect service test
+        LLSD test_block;
+        test_block["service-builder"] = "/agent/{$agent-id}/name";
+        mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);
+        LLSD data_map;
+        data_map["agent_id"] = "257c631f-a0c5-4f29-8a9f-9031feaae6c6";
+        std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilderTest", data_map);
+        ensure_equals("Replacement URL Creation for Non-existant Service", test_url , "/agent/{$agent-id}/name");
+    }
+
+    template<> template<>
+    void ServiceBuilderTestObject::test<5>()
+    {
+        LLSD test_block;
+        test_block["service-builder"] = "/proc/{$proc}{%params}";
+        mServiceBuilder.createServiceDefinition("ServiceBuilderTest", test_block["service-builder"]);
+        LLSD data_map;
+        data_map["proc"] = "do/something/useful";
+        data_map["params"]["estate_id"] = 1;
+        data_map["params"]["query"] = "public";
+        std::string test_url = mServiceBuilder.buildServiceURI("ServiceBuilderTest", data_map);
+        ensure_equals(
+            "two part URL Creation",
+            test_url ,
+            "/proc/do/something/useful?estate_id=1&query=public");
+    }
+
+    template<> template<>
+    void ServiceBuilderTestObject::test<6>()
+    {
+        LLSD test_block;
+        test_block["service-builder"] = "Which way to the {${$baz}}?";
+        mServiceBuilder.createServiceDefinition(
+            "ServiceBuilderTest",
+            test_block["service-builder"]);
+
+        LLSD data_map;
+        data_map["foo"] = "bar";
+        data_map["baz"] = "foo";
+        std::string test_url = mServiceBuilder.buildServiceURI(
+            "ServiceBuilderTest",
+            data_map);
+        ensure_equals(
+            "recursive url creation",
+            test_url ,
+            "Which way to the bar?");
+    }
+
+    template<> template<>
+    void ServiceBuilderTestObject::test<7>()
+    {
+        LLSD test_block;
+        test_block["service-builder"] = "Which way to the {$foo}?";
+        mServiceBuilder.createServiceDefinition(
+            "ServiceBuilderTest",
+            test_block["service-builder"]);
+
+        LLSD data_map;
+        data_map["baz"] = "foo";
+        std::string test_url = mServiceBuilder.buildServiceURI(
+            "ServiceBuilderTest",
+            data_map);
+        ensure_equals(
+            "fails to do replacement",
+            test_url ,
+            "Which way to the {$foo}?");
+    }
+
+    template<> template<>
+    void ServiceBuilderTestObject::test<8>()
+    {
+        LLSD test_block;
+        test_block["service-builder"] = "/proc/{$proc}{%params}";
+        mServiceBuilder.createServiceDefinition(
+            "ServiceBuilderTest",
+            test_block["service-builder"]);
+        LLSD data_map;
+        data_map["proc"] = "do/something/useful";
+        data_map["params"] = LLSD();
+        std::string test_url = mServiceBuilder.buildServiceURI(
+            "ServiceBuilderTest",
+            data_map);
+        ensure_equals(
+            "strip params",
+            test_url ,
+            "/proc/do/something/useful");
+    }
 }