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/llmatrix3a.inl b/indra/llmath/llmatrix3a.inl
index 37819fea3c..262810746e 100644
--- a/indra/llmath/llmatrix3a.inl
+++ b/indra/llmath/llmatrix3a.inl
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llmatrix3a.inl
  * @brief LLMatrix3a inline definitions
  *
  * $LicenseInfo:firstyear=2010&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$
  */
@@ -29,91 +29,91 @@
 
 inline LLMatrix3a::LLMatrix3a( const LLVector4a& c0, const LLVector4a& c1, const LLVector4a& c2 )
 {
-	setColumns( c0, c1, c2 );
+    setColumns( c0, c1, c2 );
 }
 
 inline void LLMatrix3a::loadu(const LLMatrix3& src)
 {
-	mColumns[0].load3(src.mMatrix[0]);
-	mColumns[1].load3(src.mMatrix[1]);
-	mColumns[2].load3(src.mMatrix[2]);
+    mColumns[0].load3(src.mMatrix[0]);
+    mColumns[1].load3(src.mMatrix[1]);
+    mColumns[2].load3(src.mMatrix[2]);
 }
 
 inline void LLMatrix3a::setRows(const LLVector4a& r0, const LLVector4a& r1, const LLVector4a& r2)
 {
-	mColumns[0] = r0;
-	mColumns[1] = r1;
-	mColumns[2] = r2;
-	setTranspose( *this );
+    mColumns[0] = r0;
+    mColumns[1] = r1;
+    mColumns[2] = r2;
+    setTranspose( *this );
 }
 
 inline void LLMatrix3a::setColumns(const LLVector4a& c0, const LLVector4a& c1, const LLVector4a& c2)
 {
-	mColumns[0] = c0;
-	mColumns[1] = c1;
-	mColumns[2] = c2;
+    mColumns[0] = c0;
+    mColumns[1] = c1;
+    mColumns[2] = c2;
 }
 
 inline void LLMatrix3a::setTranspose(const LLMatrix3a& src)
 {
-	const LLQuad srcCol0 = src.mColumns[0];
-	const LLQuad srcCol1 = src.mColumns[1];
-	const LLQuad unpacklo = _mm_unpacklo_ps( srcCol0, srcCol1 );
-	mColumns[0] = _mm_movelh_ps( unpacklo, src.mColumns[2] );
-	mColumns[1] = _mm_shuffle_ps( _mm_movehl_ps( srcCol0, unpacklo ), src.mColumns[2], _MM_SHUFFLE(0, 1, 1, 0) );
-	mColumns[2] = _mm_shuffle_ps( _mm_unpackhi_ps( srcCol0, srcCol1 ), src.mColumns[2], _MM_SHUFFLE(0, 2, 1, 0) );
+    const LLQuad srcCol0 = src.mColumns[0];
+    const LLQuad srcCol1 = src.mColumns[1];
+    const LLQuad unpacklo = _mm_unpacklo_ps( srcCol0, srcCol1 );
+    mColumns[0] = _mm_movelh_ps( unpacklo, src.mColumns[2] );
+    mColumns[1] = _mm_shuffle_ps( _mm_movehl_ps( srcCol0, unpacklo ), src.mColumns[2], _MM_SHUFFLE(0, 1, 1, 0) );
+    mColumns[2] = _mm_shuffle_ps( _mm_unpackhi_ps( srcCol0, srcCol1 ), src.mColumns[2], _MM_SHUFFLE(0, 2, 1, 0) );
 }
 
 inline const LLVector4a& LLMatrix3a::getColumn(const U32 column) const
 {
-	llassert( column < 3 );
-	return mColumns[column];
+    llassert( column < 3 );
+    return mColumns[column];
 }
 
 inline void LLMatrix3a::setLerp(const LLMatrix3a& a, const LLMatrix3a& b, F32 w)
 {
-	mColumns[0].setLerp( a.mColumns[0], b.mColumns[0], w );
-	mColumns[1].setLerp( a.mColumns[1], b.mColumns[1], w );
-	mColumns[2].setLerp( a.mColumns[2], b.mColumns[2], w );
+    mColumns[0].setLerp( a.mColumns[0], b.mColumns[0], w );
+    mColumns[1].setLerp( a.mColumns[1], b.mColumns[1], w );
+    mColumns[2].setLerp( a.mColumns[2], b.mColumns[2], w );
 }
 
 inline LLBool32 LLMatrix3a::isFinite() const
 {
-	return mColumns[0].isFinite3() && mColumns[1].isFinite3() && mColumns[2].isFinite3();
+    return mColumns[0].isFinite3() && mColumns[1].isFinite3() && mColumns[2].isFinite3();
 }
 
 inline void LLMatrix3a::getDeterminant( LLVector4a& dest ) const
 {
-	LLVector4a col1xcol2; col1xcol2.setCross3( mColumns[1], mColumns[2] );
-	dest.setAllDot3( col1xcol2, mColumns[0] );
+    LLVector4a col1xcol2; col1xcol2.setCross3( mColumns[1], mColumns[2] );
+    dest.setAllDot3( col1xcol2, mColumns[0] );
 }
 
 inline LLSimdScalar LLMatrix3a::getDeterminant() const
 {
-	LLVector4a col1xcol2; col1xcol2.setCross3( mColumns[1], mColumns[2] );
-	return col1xcol2.dot3( mColumns[0] );
+    LLVector4a col1xcol2; col1xcol2.setCross3( mColumns[1], mColumns[2] );
+    return col1xcol2.dot3( mColumns[0] );
 }
 
 inline bool LLMatrix3a::isApproximatelyEqual( const LLMatrix3a& rhs, F32 tolerance /*= F_APPROXIMATELY_ZERO*/ ) const
 {
-	return rhs.getColumn(0).equals3(mColumns[0], tolerance) 
-		&& rhs.getColumn(1).equals3(mColumns[1], tolerance) 
-		&& rhs.getColumn(2).equals3(mColumns[2], tolerance); 
+    return rhs.getColumn(0).equals3(mColumns[0], tolerance)
+        && rhs.getColumn(1).equals3(mColumns[1], tolerance)
+        && rhs.getColumn(2).equals3(mColumns[2], tolerance);
 }
 
 inline const LLMatrix3a& LLMatrix3a::getIdentity()
 {
-	extern const LLMatrix3a LL_M3A_IDENTITY;
-	return LL_M3A_IDENTITY;
+    extern const LLMatrix3a LL_M3A_IDENTITY;
+    return LL_M3A_IDENTITY;
 }
 
 inline bool LLRotation::isOkRotation() const
 {
-	LLMatrix3a transpose; transpose.setTranspose( *this );
-	LLMatrix3a product; product.setMul( *this, transpose );
+    LLMatrix3a transpose; transpose.setTranspose( *this );
+    LLMatrix3a product; product.setMul( *this, transpose );
 
-	LLSimdScalar detMinusOne = getDeterminant() - 1.f;
+    LLSimdScalar detMinusOne = getDeterminant() - 1.f;
 
-	return product.isApproximatelyEqual( LLMatrix3a::getIdentity() ) && (detMinusOne.getAbs() < F_APPROXIMATELY_ZERO);
+    return product.isApproximatelyEqual( LLMatrix3a::getIdentity() ) && (detMinusOne.getAbs() < F_APPROXIMATELY_ZERO);
 }