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

diff --git a/indra/llmath/tests/llmodularmath_test.cpp b/indra/llmath/tests/llmodularmath_test.cpp
index 063d3ef79f..399b3af05d 100644
--- a/indra/llmath/tests/llmodularmath_test.cpp
+++ b/indra/llmath/tests/llmodularmath_test.cpp
@@ -7,25 +7,25 @@
  * $LicenseInfo:firstyear=2007&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$
  */
- 
+
 #include "linden_common.h"
 
 #include "../llmodularmath.h"
@@ -34,43 +34,43 @@
 
 namespace tut
 {
-	struct modularmath_data
-	{
-	};
-	typedef test_group<modularmath_data> modularmath_test;
-	typedef modularmath_test::object modularmath_object;
-	tut::modularmath_test modularmath_testcase("LLModularMath");
+    struct modularmath_data
+    {
+    };
+    typedef test_group<modularmath_data> modularmath_test;
+    typedef modularmath_test::object modularmath_object;
+    tut::modularmath_test modularmath_testcase("LLModularMath");
 
-	template<> template<>
-	void modularmath_object::test<1>()
-	{
-		// lhs < rhs
-		const U32 lhs = 0x000001;
-		const U32 rhs = 0xFFFFFF;
-		const U32 width = 24;
-		U32 result = LLModularMath::subtract<width>(lhs, rhs); 
-		ensure_equals("diff(0x000001, 0xFFFFFF, 24)", result, 2);
-	}
+    template<> template<>
+    void modularmath_object::test<1>()
+    {
+        // lhs < rhs
+        const U32 lhs = 0x000001;
+        const U32 rhs = 0xFFFFFF;
+        const U32 width = 24;
+        U32 result = LLModularMath::subtract<width>(lhs, rhs);
+        ensure_equals("diff(0x000001, 0xFFFFFF, 24)", result, 2);
+    }
 
-	template<> template<>
-	void modularmath_object::test<2>()
-	{
-		// lhs > rhs
-		const U32 lhs = 0x000002;
-		const U32 rhs = 0x000001;
-		const U32 width = 24;
-		U32 result = LLModularMath::subtract<width>(lhs, rhs); 
-		ensure_equals("diff(0x000002, 0x000001, 24)", result, 1);
-	}
+    template<> template<>
+    void modularmath_object::test<2>()
+    {
+        // lhs > rhs
+        const U32 lhs = 0x000002;
+        const U32 rhs = 0x000001;
+        const U32 width = 24;
+        U32 result = LLModularMath::subtract<width>(lhs, rhs);
+        ensure_equals("diff(0x000002, 0x000001, 24)", result, 1);
+    }
 
-	template<> template<>
-	void modularmath_object::test<3>()
-	{
-		// lhs == rhs
-		const U32 lhs = 0xABCDEF;
-		const U32 rhs = 0xABCDEF;
-		const U32 width = 24;
-		U32 result = LLModularMath::subtract<width>(lhs, rhs); 
-		ensure_equals("diff(0xABCDEF, 0xABCDEF, 24)", result, 0);
-	}	
+    template<> template<>
+    void modularmath_object::test<3>()
+    {
+        // lhs == rhs
+        const U32 lhs = 0xABCDEF;
+        const U32 rhs = 0xABCDEF;
+        const U32 width = 24;
+        U32 result = LLModularMath::subtract<width>(lhs, rhs);
+        ensure_equals("diff(0xABCDEF, 0xABCDEF, 24)", result, 0);
+    }
 }