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

diff --git a/indra/llmath/llplane.h b/indra/llmath/llplane.h
index 64a3eed0e5..4e8546e32b 100644
--- a/indra/llmath/llplane.h
+++ b/indra/llmath/llplane.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llplane.h
  *
  * $LicenseInfo:firstyear=2001&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 @@
 
 // A simple way to specify a plane is to give its normal,
 // and it's nearest approach to the origin.
-// 
+//
 // Given the equation for a plane : A*x + B*y + C*z + D = 0
 // The plane normal = [A, B, C]
 // The closest approach = D / sqrt(A*A + B*B + C*C)
@@ -41,67 +41,67 @@ LL_ALIGN_PREFIX(16)
 class LLPlane
 {
 public:
-	
-	// Constructors
-	LLPlane() {}; // no default constructor
-	LLPlane(const LLVector3 &p0, F32 d) { setVec(p0, d); }
-	LLPlane(const LLVector3 &p0, const LLVector3 &n) { setVec(p0, n); }
-	inline void setVec(const LLVector3 &p0, F32 d) { mV.set(p0[0], p0[1], p0[2], d); }
-	
-	// Set
-	inline void setVec(const LLVector3 &p0, const LLVector3 &n)
-	{
-		F32 d = -(p0 * n);
-		setVec(n, d);
-	}
-	inline void setVec(const LLVector3 &p0, const LLVector3 &p1, const LLVector3 &p2)
-	{
-		LLVector3 u, v, w;
-		u = p1 - p0;
-		v = p2 - p0;
-		w = u % v;
-		w.normVec();
-		F32 d = -(w * p0);
-		setVec(w, d);
-	}
-	
-	inline LLPlane& operator=(const LLVector4& v2) {  mV.set(v2[0],v2[1],v2[2],v2[3]); return *this;}
-	
-	inline LLPlane& operator=(const LLVector4a& v2) {  mV.set(v2[0],v2[1],v2[2],v2[3]); return *this;}	
-	
-	inline void set(const LLPlane& p2) { mV = p2.mV; }
-	
-	// 
-	F32 dist(const LLVector3 &v2) const { return mV[0]*v2[0] + mV[1]*v2[1] + mV[2]*v2[2] + mV[3]; }
-	
-	inline LLSimdScalar dot3(const LLVector4a& b) const { return mV.dot3(b); }
-	
-	// Read-only access a single float in this vector. Do not use in proximity to any function call that manipulates
-	// the data at the whole vector level or you will incur a substantial penalty. Consider using the splat functions instead	
-	inline F32 operator[](const S32 idx) const { return mV[idx]; }
-	
-	// preferable when index is known at compile time
-	template <int N> LL_FORCE_INLINE void getAt(LLSimdScalar& v) const { v = mV.getScalarAt<N>(); } 
-	
-	// reset the vector to 0, 0, 0, 1
-	inline void clear() { mV.set(0, 0, 0, 1); }
-	
-	inline void getVector3(LLVector3& vec) const { vec.set(mV[0], mV[1], mV[2]); }
-	
-	// Retrieve the mask indicating which of the x, y, or z axis are greater or equal to zero.
-	inline U8 calcPlaneMask() 
-	{ 
-		return mV.greaterEqual(LLVector4a::getZero()).getGatheredBits() & LLVector4Logical::MASK_XYZ;
-	}
-	
-	//check if two planes are nearly same
-	bool equal(const LLPlane& p) const
-	{
-		return mV.equals4(p.mV);
-	}
+
+    // Constructors
+    LLPlane() {}; // no default constructor
+    LLPlane(const LLVector3 &p0, F32 d) { setVec(p0, d); }
+    LLPlane(const LLVector3 &p0, const LLVector3 &n) { setVec(p0, n); }
+    inline void setVec(const LLVector3 &p0, F32 d) { mV.set(p0[0], p0[1], p0[2], d); }
+
+    // Set
+    inline void setVec(const LLVector3 &p0, const LLVector3 &n)
+    {
+        F32 d = -(p0 * n);
+        setVec(n, d);
+    }
+    inline void setVec(const LLVector3 &p0, const LLVector3 &p1, const LLVector3 &p2)
+    {
+        LLVector3 u, v, w;
+        u = p1 - p0;
+        v = p2 - p0;
+        w = u % v;
+        w.normVec();
+        F32 d = -(w * p0);
+        setVec(w, d);
+    }
+
+    inline LLPlane& operator=(const LLVector4& v2) {  mV.set(v2[0],v2[1],v2[2],v2[3]); return *this;}
+
+    inline LLPlane& operator=(const LLVector4a& v2) {  mV.set(v2[0],v2[1],v2[2],v2[3]); return *this;}
+
+    inline void set(const LLPlane& p2) { mV = p2.mV; }
+
+    //
+    F32 dist(const LLVector3 &v2) const { return mV[0]*v2[0] + mV[1]*v2[1] + mV[2]*v2[2] + mV[3]; }
+
+    inline LLSimdScalar dot3(const LLVector4a& b) const { return mV.dot3(b); }
+
+    // Read-only access a single float in this vector. Do not use in proximity to any function call that manipulates
+    // the data at the whole vector level or you will incur a substantial penalty. Consider using the splat functions instead
+    inline F32 operator[](const S32 idx) const { return mV[idx]; }
+
+    // preferable when index is known at compile time
+    template <int N> LL_FORCE_INLINE void getAt(LLSimdScalar& v) const { v = mV.getScalarAt<N>(); }
+
+    // reset the vector to 0, 0, 0, 1
+    inline void clear() { mV.set(0, 0, 0, 1); }
+
+    inline void getVector3(LLVector3& vec) const { vec.set(mV[0], mV[1], mV[2]); }
+
+    // Retrieve the mask indicating which of the x, y, or z axis are greater or equal to zero.
+    inline U8 calcPlaneMask()
+    {
+        return mV.greaterEqual(LLVector4a::getZero()).getGatheredBits() & LLVector4Logical::MASK_XYZ;
+    }
+
+    //check if two planes are nearly same
+    bool equal(const LLPlane& p) const
+    {
+        return mV.equals4(p.mV);
+    }
 
 private:
-	LLVector4a mV;
+    LLVector4a mV;
 } LL_ALIGN_POSTFIX(16);