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

diff --git a/indra/llmath/llsimdtypes.h b/indra/llmath/llsimdtypes.h
index bd991d0e71..9db152adf8 100644
--- a/indra/llmath/llsimdtypes.h
+++ b/indra/llmath/llsimdtypes.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsimdtypes.h
  * @brief Declaration of basic SIMD math related types
  *
  * $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$
  */
@@ -31,7 +31,7 @@
 #error "Please include llmath.h before this file."
 #endif
 
-typedef __m128	LLQuad;
+typedef __m128  LLQuad;
 
 
 #if LL_WINDOWS
@@ -50,17 +50,17 @@ __forceinline const __m128i _mm_castps_si128( const __m128 a ) { return reinterp
 class LLBool32
 {
 public:
-	inline LLBool32() {}
-	inline LLBool32(int rhs) : m_bool(rhs) {}
-	inline LLBool32(unsigned int rhs) : m_bool(rhs) {}
-	inline LLBool32(bool rhs) { m_bool = static_cast<const int>(rhs); }
-	inline LLBool32& operator= (bool rhs) { m_bool = (int)rhs; return *this; }
-	inline bool operator== (bool rhs) const { return static_cast<const bool&>(m_bool) == rhs; }
-	inline bool operator!= (bool rhs) const { return !operator==(rhs); }
-	inline operator bool() const { return static_cast<const bool&>(m_bool); }
+    inline LLBool32() {}
+    inline LLBool32(int rhs) : m_bool(rhs) {}
+    inline LLBool32(unsigned int rhs) : m_bool(rhs) {}
+    inline LLBool32(bool rhs) { m_bool = static_cast<const int>(rhs); }
+    inline LLBool32& operator= (bool rhs) { m_bool = (int)rhs; return *this; }
+    inline bool operator== (bool rhs) const { return static_cast<const bool&>(m_bool) == rhs; }
+    inline bool operator!= (bool rhs) const { return !operator==(rhs); }
+    inline operator bool() const { return static_cast<const bool&>(m_bool); }
 
 private:
-	int m_bool;
+    int m_bool;
 };
 
 #if LL_WINDOWS
@@ -70,55 +70,55 @@ private:
 class LLSimdScalar
 {
 public:
-	inline LLSimdScalar() {}
-	inline LLSimdScalar(LLQuad q) 
-	{ 
-		mQ = q; 
-	}
+    inline LLSimdScalar() {}
+    inline LLSimdScalar(LLQuad q)
+    {
+        mQ = q;
+    }
+
+    inline LLSimdScalar(F32 f)
+    {
+        mQ = _mm_set_ss(f);
+    }
+
+    static inline const LLSimdScalar& getZero()
+    {
+        extern const LLQuad F_ZERO_4A;
+        return reinterpret_cast<const LLSimdScalar&>(F_ZERO_4A);
+    }
 
-	inline LLSimdScalar(F32 f) 
-	{ 
-		mQ = _mm_set_ss(f); 
-	}
+    inline F32 getF32() const;
 
-	static inline const LLSimdScalar& getZero()
-	{
-		extern const LLQuad F_ZERO_4A;
-		return reinterpret_cast<const LLSimdScalar&>(F_ZERO_4A);
-	}
+    inline LLBool32 isApproximatelyEqual(const LLSimdScalar& rhs, F32 tolerance = F_APPROXIMATELY_ZERO) const;
 
-	inline F32 getF32() const;
+    inline LLSimdScalar getAbs() const;
 
-	inline LLBool32 isApproximatelyEqual(const LLSimdScalar& rhs, F32 tolerance = F_APPROXIMATELY_ZERO) const;
+    inline void setMax( const LLSimdScalar& a, const LLSimdScalar& b );
 
-	inline LLSimdScalar getAbs() const;
+    inline void setMin( const LLSimdScalar& a, const LLSimdScalar& b );
 
-	inline void setMax( const LLSimdScalar& a, const LLSimdScalar& b );
-	
-	inline void setMin( const LLSimdScalar& a, const LLSimdScalar& b );
+    inline LLSimdScalar& operator=(F32 rhs);
 
-	inline LLSimdScalar& operator=(F32 rhs);
+    inline LLSimdScalar& operator+=(const LLSimdScalar& rhs);
 
-	inline LLSimdScalar& operator+=(const LLSimdScalar& rhs);
+    inline LLSimdScalar& operator-=(const LLSimdScalar& rhs);
 
-	inline LLSimdScalar& operator-=(const LLSimdScalar& rhs);
+    inline LLSimdScalar& operator*=(const LLSimdScalar& rhs);
 
-	inline LLSimdScalar& operator*=(const LLSimdScalar& rhs);
+    inline LLSimdScalar& operator/=(const LLSimdScalar& rhs);
 
-	inline LLSimdScalar& operator/=(const LLSimdScalar& rhs);
+    inline operator LLQuad() const
+    {
+        return mQ;
+    }
 
-	inline operator LLQuad() const
-	{ 
-		return mQ; 
-	}
-	
-	inline const LLQuad& getQuad() const 
-	{ 
-		return mQ; 
-	}
+    inline const LLQuad& getQuad() const
+    {
+        return mQ;
+    }
 
 private:
-	LLQuad mQ;
+    LLQuad mQ;
 };
 
 #endif //LL_SIMD_TYPES_H