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

diff --git a/indra/llmath/llquaternion2.h b/indra/llmath/llquaternion2.h
index fd9c0cf3ab..902bfb7134 100644
--- a/indra/llmath/llquaternion2.h
+++ b/indra/llmath/llquaternion2.h
@@ -1,31 +1,31 @@
-/** 
+/**
  * @file llquaternion2.h
  * @brief LLQuaternion2 class header file - SIMD-enabled quaternion class
  *
  * $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_QUATERNION2_H
-#define	LL_QUATERNION2_H
+#ifndef LL_QUATERNION2_H
+#define LL_QUATERNION2_H
 
 /////////////////////////////
 // LLQuaternion2
@@ -44,61 +44,61 @@ class LLQuaternion2
 {
 public:
 
-	//////////////////////////
-	// Ctors
-	//////////////////////////
-	
-	// Ctor
-	LLQuaternion2() {}
+    //////////////////////////
+    // Ctors
+    //////////////////////////
+
+    // Ctor
+    LLQuaternion2() {}
+
+    // Ctor from LLQuaternion
+    explicit LLQuaternion2( const class LLQuaternion& quat );
 
-	// Ctor from LLQuaternion
-	explicit LLQuaternion2( const class LLQuaternion& quat );
+    //////////////////////////
+    // Get/Set
+    //////////////////////////
 
-	//////////////////////////
-	// Get/Set
-	//////////////////////////
+    // Load from an LLQuaternion
+    inline void operator=( const LLQuaternion& quat )
+    {
+        mQ.loadua( quat.mQ );
+    }
 
-	// Load from an LLQuaternion
-	inline void operator=( const LLQuaternion& quat )
-	{
-		mQ.loadua( quat.mQ );
-	}
+    // Return the internal LLVector4a representation of the quaternion
+    inline const LLVector4a& getVector4a() const;
+    inline LLVector4a& getVector4aRw();
 
-	// Return the internal LLVector4a representation of the quaternion
-	inline const LLVector4a& getVector4a() const;
-	inline LLVector4a& getVector4aRw();
+    /////////////////////////
+    // Quaternion modification
+    /////////////////////////
 
-	/////////////////////////
-	// Quaternion modification
-	/////////////////////////
-	
-	// Set this quaternion to the conjugate of src
-	inline void setConjugate(const LLQuaternion2& src);
+    // Set this quaternion to the conjugate of src
+    inline void setConjugate(const LLQuaternion2& src);
 
-	// Renormalizes the quaternion. Assumes it has nonzero length.
-	inline void normalize();
+    // Renormalizes the quaternion. Assumes it has nonzero length.
+    inline void normalize();
 
-	// Quantize this quaternion to 8 bit precision
-	inline void quantize8();
+    // Quantize this quaternion to 8 bit precision
+    inline void quantize8();
 
-	// Quantize this quaternion to 16 bit precision
-	inline void quantize16();
+    // Quantize this quaternion to 16 bit precision
+    inline void quantize16();
 
-	/////////////////////////
-	// Quaternion inspection
-	/////////////////////////
+    /////////////////////////
+    // Quaternion inspection
+    /////////////////////////
 
-	// Return true if this quaternion is equal to 'rhs'. 
-	// Note! Quaternions exhibit "double-cover", so any rotation has two equally valid
-	// quaternion representations and they will NOT compare equal.
-	inline bool equals(const LLQuaternion2& rhs, F32 tolerance = F_APPROXIMATELY_ZERO ) const;
+    // Return true if this quaternion is equal to 'rhs'.
+    // Note! Quaternions exhibit "double-cover", so any rotation has two equally valid
+    // quaternion representations and they will NOT compare equal.
+    inline bool equals(const LLQuaternion2& rhs, F32 tolerance = F_APPROXIMATELY_ZERO ) const;
 
-	// Return true if all components are finite and the quaternion is normalized
-	inline bool isOkRotation() const;
+    // Return true if all components are finite and the quaternion is normalized
+    inline bool isOkRotation() const;
 
 protected:
 
-	LLVector4a mQ;
+    LLVector4a mQ;
 
 };