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

diff --git a/indra/llmath/llmatrix4a.cpp b/indra/llmath/llmatrix4a.cpp
index fe8f0b98f3..00e30a248b 100644
--- a/indra/llmath/llmatrix4a.cpp
+++ b/indra/llmath/llmatrix4a.cpp
@@ -33,48 +33,48 @@
 // necessarily the fastest way to implement.
 void matMulBoundBox(const LLMatrix4a &mat, const LLVector4a *in_extents, LLVector4a *out_extents)
 {
-		//get 8 corners of bounding box
-		LLVector4Logical mask[6];
+        //get 8 corners of bounding box
+        LLVector4Logical mask[6];
 
-		for (U32 i = 0; i < 6; ++i)
-		{
-			mask[i].clear();
-		}
+        for (U32 i = 0; i < 6; ++i)
+        {
+            mask[i].clear();
+        }
 
-		mask[0].setElement<2>(); //001
-		mask[1].setElement<1>(); //010
-		mask[2].setElement<1>(); //011
-		mask[2].setElement<2>();
-		mask[3].setElement<0>(); //100
-		mask[4].setElement<0>(); //101
-		mask[4].setElement<2>();
-		mask[5].setElement<0>(); //110
-		mask[5].setElement<1>();
+        mask[0].setElement<2>(); //001
+        mask[1].setElement<1>(); //010
+        mask[2].setElement<1>(); //011
+        mask[2].setElement<2>();
+        mask[3].setElement<0>(); //100
+        mask[4].setElement<0>(); //101
+        mask[4].setElement<2>();
+        mask[5].setElement<0>(); //110
+        mask[5].setElement<1>();
 
-		LLVector4a v[8];
+        LLVector4a v[8];
 
-		v[6] = in_extents[0];
-		v[7] = in_extents[1];
+        v[6] = in_extents[0];
+        v[7] = in_extents[1];
 
-		for (U32 i = 0; i < 6; ++i)
-		{
-			v[i].setSelectWithMask(mask[i], in_extents[0], in_extents[1]);
-		}
+        for (U32 i = 0; i < 6; ++i)
+        {
+            v[i].setSelectWithMask(mask[i], in_extents[0], in_extents[1]);
+        }
 
-		LLVector4a tv[8];
+        LLVector4a tv[8];
 
-		//transform bounding box into drawable space
-		for (U32 i = 0; i < 8; ++i)
-		{
-			mat.affineTransform(v[i], tv[i]);
-		}
-	
-		//find bounding box
-		out_extents[0] = out_extents[1] = tv[0];
+        //transform bounding box into drawable space
+        for (U32 i = 0; i < 8; ++i)
+        {
+            mat.affineTransform(v[i], tv[i]);
+        }
 
-		for (U32 i = 1; i < 8; ++i)
-		{
-			out_extents[0].setMin(out_extents[0], tv[i]);
-			out_extents[1].setMax(out_extents[1], tv[i]);
-		}
+        //find bounding box
+        out_extents[0] = out_extents[1] = tv[0];
+
+        for (U32 i = 1; i < 8; ++i)
+        {
+            out_extents[0].setMin(out_extents[0], tv[i]);
+            out_extents[1].setMax(out_extents[1], tv[i]);
+        }
 }