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

diff --git a/indra/test/lluserrelations_tut.cpp b/indra/test/lluserrelations_tut.cpp
index afbcf6e5a8..80a659da65 100644
--- a/indra/test/lluserrelations_tut.cpp
+++ b/indra/test/lluserrelations_tut.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lluserrelations_tut.cpp
  * @author Phoenix
  * @date 2006-10-12
@@ -7,21 +7,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$
  */
@@ -33,124 +33,124 @@
 
 namespace tut
 {
-	struct user_relationship
-	{
-		LLRelationship mRelationship;
-	};
-	typedef test_group<user_relationship> user_relationship_t;
-	typedef user_relationship_t::object user_relationship_object_t;
-	tut::user_relationship_t tut_user_relationship("relationships");
+    struct user_relationship
+    {
+        LLRelationship mRelationship;
+    };
+    typedef test_group<user_relationship> user_relationship_t;
+    typedef user_relationship_t::object user_relationship_object_t;
+    tut::user_relationship_t tut_user_relationship("relationships");
 
-	template<> template<>
-	void user_relationship_object_t::test<1>()
-	{
-		// Test the default construction
-		ensure(
-			"No granted rights to",
-			!mRelationship.isRightGrantedTo(
-				LLRelationship::GRANT_ONLINE_STATUS));
-		ensure(
-			"No granted rights from",
-			!mRelationship.isRightGrantedFrom(
-				LLRelationship::GRANT_ONLINE_STATUS));
-		ensure("No online status",!mRelationship.isOnline());
-	}
+    template<> template<>
+    void user_relationship_object_t::test<1>()
+    {
+        // Test the default construction
+        ensure(
+            "No granted rights to",
+            !mRelationship.isRightGrantedTo(
+                LLRelationship::GRANT_ONLINE_STATUS));
+        ensure(
+            "No granted rights from",
+            !mRelationship.isRightGrantedFrom(
+                LLRelationship::GRANT_ONLINE_STATUS));
+        ensure("No online status",!mRelationship.isOnline());
+    }
 
-	template<> template<>
-	void user_relationship_object_t::test<2>()
-	{
-		// Test some granting
-		mRelationship.grantRights(
-			LLRelationship::GRANT_ONLINE_STATUS,
-			LLRelationship::GRANT_MODIFY_OBJECTS);
-		ensure(
-			"Granted rights to has online",
-			mRelationship.isRightGrantedTo(
-				LLRelationship::GRANT_ONLINE_STATUS));
-		ensure(
-			"Granted rights from does not have online",
-			!mRelationship.isRightGrantedFrom(
-				LLRelationship::GRANT_ONLINE_STATUS));
-		ensure(
-			"Granted rights to does not have modify",
-			!mRelationship.isRightGrantedTo(
-				LLRelationship::GRANT_MODIFY_OBJECTS));
-		ensure(
-			"Granted rights from has modify",
-			mRelationship.isRightGrantedFrom(
-				LLRelationship::GRANT_MODIFY_OBJECTS));
-	}
+    template<> template<>
+    void user_relationship_object_t::test<2>()
+    {
+        // Test some granting
+        mRelationship.grantRights(
+            LLRelationship::GRANT_ONLINE_STATUS,
+            LLRelationship::GRANT_MODIFY_OBJECTS);
+        ensure(
+            "Granted rights to has online",
+            mRelationship.isRightGrantedTo(
+                LLRelationship::GRANT_ONLINE_STATUS));
+        ensure(
+            "Granted rights from does not have online",
+            !mRelationship.isRightGrantedFrom(
+                LLRelationship::GRANT_ONLINE_STATUS));
+        ensure(
+            "Granted rights to does not have modify",
+            !mRelationship.isRightGrantedTo(
+                LLRelationship::GRANT_MODIFY_OBJECTS));
+        ensure(
+            "Granted rights from has modify",
+            mRelationship.isRightGrantedFrom(
+                LLRelationship::GRANT_MODIFY_OBJECTS));
+    }
 
-	template<> template<>
-	void user_relationship_object_t::test<3>()
-	{
-		// Test revoking
-		mRelationship.grantRights(
-			LLRelationship::GRANT_ONLINE_STATUS
-			| LLRelationship::GRANT_MAP_LOCATION,
-			LLRelationship::GRANT_ONLINE_STATUS);
-		ensure(
-			"Granted rights to has online and map",
-			mRelationship.isRightGrantedTo(
-				LLRelationship::GRANT_ONLINE_STATUS
-				| LLRelationship::GRANT_MAP_LOCATION));
-		ensure(
-			"Granted rights from has online",
-			mRelationship.isRightGrantedFrom(
-				LLRelationship::GRANT_ONLINE_STATUS));
+    template<> template<>
+    void user_relationship_object_t::test<3>()
+    {
+        // Test revoking
+        mRelationship.grantRights(
+            LLRelationship::GRANT_ONLINE_STATUS
+            | LLRelationship::GRANT_MAP_LOCATION,
+            LLRelationship::GRANT_ONLINE_STATUS);
+        ensure(
+            "Granted rights to has online and map",
+            mRelationship.isRightGrantedTo(
+                LLRelationship::GRANT_ONLINE_STATUS
+                | LLRelationship::GRANT_MAP_LOCATION));
+        ensure(
+            "Granted rights from has online",
+            mRelationship.isRightGrantedFrom(
+                LLRelationship::GRANT_ONLINE_STATUS));
 
-		mRelationship.revokeRights(
-			LLRelationship::GRANT_MAP_LOCATION,
-			LLRelationship::GRANT_NONE);
-		ensure(
-			"Granted rights revoked map",
-			!mRelationship.isRightGrantedTo(
-				LLRelationship::GRANT_ONLINE_STATUS
-				| LLRelationship::GRANT_MAP_LOCATION));
-		ensure(
-			"Granted rights revoked still has online",
-			mRelationship.isRightGrantedTo(
-				LLRelationship::GRANT_ONLINE_STATUS));
+        mRelationship.revokeRights(
+            LLRelationship::GRANT_MAP_LOCATION,
+            LLRelationship::GRANT_NONE);
+        ensure(
+            "Granted rights revoked map",
+            !mRelationship.isRightGrantedTo(
+                LLRelationship::GRANT_ONLINE_STATUS
+                | LLRelationship::GRANT_MAP_LOCATION));
+        ensure(
+            "Granted rights revoked still has online",
+            mRelationship.isRightGrantedTo(
+                LLRelationship::GRANT_ONLINE_STATUS));
 
-		mRelationship.grantRights(
-			LLRelationship::GRANT_NONE,
-			LLRelationship::GRANT_MODIFY_OBJECTS);
-		ensure(
-			"Granted rights from still has online",
-			mRelationship.isRightGrantedFrom(
-				LLRelationship::GRANT_ONLINE_STATUS));
-		ensure(
-			"Granted rights from has full grant",
-			mRelationship.isRightGrantedFrom(
-				LLRelationship::GRANT_ONLINE_STATUS
-				| LLRelationship::GRANT_MODIFY_OBJECTS));
-		mRelationship.revokeRights(
-			LLRelationship::GRANT_NONE,
-			LLRelationship::GRANT_MODIFY_OBJECTS);
-		ensure(
-			"Granted rights from still has online",
-			mRelationship.isRightGrantedFrom(
-				LLRelationship::GRANT_ONLINE_STATUS));
-		ensure(
-			"Granted rights from no longer modify",
-			!mRelationship.isRightGrantedFrom(
-				LLRelationship::GRANT_MODIFY_OBJECTS));	
-	}
+        mRelationship.grantRights(
+            LLRelationship::GRANT_NONE,
+            LLRelationship::GRANT_MODIFY_OBJECTS);
+        ensure(
+            "Granted rights from still has online",
+            mRelationship.isRightGrantedFrom(
+                LLRelationship::GRANT_ONLINE_STATUS));
+        ensure(
+            "Granted rights from has full grant",
+            mRelationship.isRightGrantedFrom(
+                LLRelationship::GRANT_ONLINE_STATUS
+                | LLRelationship::GRANT_MODIFY_OBJECTS));
+        mRelationship.revokeRights(
+            LLRelationship::GRANT_NONE,
+            LLRelationship::GRANT_MODIFY_OBJECTS);
+        ensure(
+            "Granted rights from still has online",
+            mRelationship.isRightGrantedFrom(
+                LLRelationship::GRANT_ONLINE_STATUS));
+        ensure(
+            "Granted rights from no longer modify",
+            !mRelationship.isRightGrantedFrom(
+                LLRelationship::GRANT_MODIFY_OBJECTS));
+    }
 
-	template<> template<>
-	void user_relationship_object_t::test<4>()
-	{
-		ensure("No online status", !mRelationship.isOnline());
-		mRelationship.online(true);
-		ensure("Online status", mRelationship.isOnline());
-		mRelationship.online(false);
-		ensure("No online status", !mRelationship.isOnline());
-	}
+    template<> template<>
+    void user_relationship_object_t::test<4>()
+    {
+        ensure("No online status", !mRelationship.isOnline());
+        mRelationship.online(true);
+        ensure("Online status", mRelationship.isOnline());
+        mRelationship.online(false);
+        ensure("No online status", !mRelationship.isOnline());
+    }
 
 /*
-	template<> template<>
-	void user_relationship_object_t::test<>()
-	{
-	}
+    template<> template<>
+    void user_relationship_object_t::test<>()
+    {
+    }
 */
 }