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

diff --git a/indra/llmath/llvector4logical.h b/indra/llmath/llvector4logical.h
index c5698f7cea..d08b5513d9 100644
--- a/indra/llmath/llvector4logical.h
+++ b/indra/llmath/llvector4logical.h
@@ -1,31 +1,31 @@
-/** 
+/**
  * @file llvector4logical.h
  * @brief LLVector4Logical class header file - Companion class to LLVector4a for logical and bit-twiddling operations
  *
  * $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$
  */
 
-#ifndef	LL_VECTOR4LOGICAL_H
-#define	LL_VECTOR4LOGICAL_H
+#ifndef LL_VECTOR4LOGICAL_H
+#define LL_VECTOR4LOGICAL_H
 
 #include "llmemory.h"
 
@@ -41,86 +41,86 @@
 
 static LL_ALIGN_16(const U32 S_V4LOGICAL_MASK_TABLE[4*4]) =
 {
-	0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF
+    0xFFFFFFFF, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0xFFFFFFFF, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF
 };
 
 class LLVector4Logical
 {
 public:
-	
-	enum {
-		MASK_X = 1,
-		MASK_Y = 1 << 1,
-		MASK_Z = 1 << 2,
-		MASK_W = 1 << 3,
-		MASK_XYZ = MASK_X | MASK_Y | MASK_Z,
-		MASK_XYZW = MASK_XYZ | MASK_W
-	};
-	
-	// Empty default ctor
-	LLVector4Logical() {}
-	
-	LLVector4Logical( const LLQuad& quad )
-	{
-		mQ = quad;
-	}
-	
-	// Create and return a mask consisting of the lowest order bit of each element
-	inline U32 getGatheredBits() const
-	{
-		return _mm_movemask_ps(mQ);
-	};	
-	
-	// Invert this mask
-	inline LLVector4Logical& invert()
-	{
-		static const LL_ALIGN_16(U32 allOnes[4]) = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
-		ll_assert_aligned(allOnes,16);
-		mQ = _mm_andnot_ps( mQ, *(LLQuad*)(allOnes) );
-		return *this;
-	}
-	
-	inline LLBool32 areAllSet( U32 mask ) const
-	{
-		return ( getGatheredBits() & mask) == mask;
-	}
-	
-	inline LLBool32 areAllSet() const
-	{
-		return areAllSet( MASK_XYZW );
-	}
-		
-	inline LLBool32 areAnySet( U32 mask ) const
-	{
-		return getGatheredBits() & mask;
-	}
-	
-	inline LLBool32 areAnySet() const
-	{
-		return areAnySet( MASK_XYZW );
-	}
-	
-	inline operator LLQuad() const
-	{
-		return mQ;
-	}
-
-	inline void clear() 
-	{
-		mQ = _mm_setzero_ps();
-	}
-
-	template<int N> void setElement()
-	{
-		mQ = _mm_or_ps( mQ, *reinterpret_cast<const LLQuad*>(S_V4LOGICAL_MASK_TABLE + 4*N) );
-	}
-	
+
+    enum {
+        MASK_X = 1,
+        MASK_Y = 1 << 1,
+        MASK_Z = 1 << 2,
+        MASK_W = 1 << 3,
+        MASK_XYZ = MASK_X | MASK_Y | MASK_Z,
+        MASK_XYZW = MASK_XYZ | MASK_W
+    };
+
+    // Empty default ctor
+    LLVector4Logical() {}
+
+    LLVector4Logical( const LLQuad& quad )
+    {
+        mQ = quad;
+    }
+
+    // Create and return a mask consisting of the lowest order bit of each element
+    inline U32 getGatheredBits() const
+    {
+        return _mm_movemask_ps(mQ);
+    };
+
+    // Invert this mask
+    inline LLVector4Logical& invert()
+    {
+        static const LL_ALIGN_16(U32 allOnes[4]) = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
+        ll_assert_aligned(allOnes,16);
+        mQ = _mm_andnot_ps( mQ, *(LLQuad*)(allOnes) );
+        return *this;
+    }
+
+    inline LLBool32 areAllSet( U32 mask ) const
+    {
+        return ( getGatheredBits() & mask) == mask;
+    }
+
+    inline LLBool32 areAllSet() const
+    {
+        return areAllSet( MASK_XYZW );
+    }
+
+    inline LLBool32 areAnySet( U32 mask ) const
+    {
+        return getGatheredBits() & mask;
+    }
+
+    inline LLBool32 areAnySet() const
+    {
+        return areAnySet( MASK_XYZW );
+    }
+
+    inline operator LLQuad() const
+    {
+        return mQ;
+    }
+
+    inline void clear()
+    {
+        mQ = _mm_setzero_ps();
+    }
+
+    template<int N> void setElement()
+    {
+        mQ = _mm_or_ps( mQ, *reinterpret_cast<const LLQuad*>(S_V4LOGICAL_MASK_TABLE + 4*N) );
+    }
+
 private:
-	
-	LLQuad mQ;
+
+    LLQuad mQ;
 };
 
 #endif //LL_VECTOR4ALOGICAL_H