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

diff --git a/indra/llmath/llbbox.h b/indra/llmath/llbbox.h
index 8ae5f221f7..988b95c54d 100644
--- a/indra/llmath/llbbox.h
+++ b/indra/llmath/llbbox.h
@@ -1,101 +1,101 @@
-/** 
- * @file llbbox.h
- * @brief General purpose bounding box class
- *
- * $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$
- */
-
-#ifndef LL_BBOX_H
-#define LL_BBOX_H
-
-#include "v3math.h"
-#include "llquaternion.h"
-
-// Note: "local space" for an LLBBox is defined relative to agent space in terms of
-// a translation followed by a rotation.  There is no scale term since the LLBBox's min and 
-// max are not necessarily symetrical and define their own extents.
-
-class LLBBox
-{
-public:
-	LLBBox() {mEmpty = true;}
-	LLBBox( const LLVector3& pos_agent,
-		const LLQuaternion& rot,
-		const LLVector3& min_local,
-		const LLVector3& max_local )
-		:
-		mMinLocal( min_local ), mMaxLocal( max_local ), mPosAgent(pos_agent), mRotation( rot), mEmpty( true )
-		{}
-
-	// Default copy constructor is OK.
-
-	const LLVector3&	getPositionAgent() const			{ return mPosAgent; }
-	const LLQuaternion&	getRotation() const					{ return mRotation; }
-
-	LLVector3           getMinAgent() const;
-	const LLVector3&	getMinLocal() const					{ return mMinLocal; }
-	void				setMinLocal( const LLVector3& min )	{ mMinLocal = min; }
-
-	LLVector3           getMaxAgent() const;
-	const LLVector3&	getMaxLocal() const					{ return mMaxLocal; }
-	void				setMaxLocal( const LLVector3& max )	{ mMaxLocal = max; }
-
-	LLVector3			getCenterLocal() const				{ return (mMaxLocal - mMinLocal) * 0.5f + mMinLocal; }
-	LLVector3			getCenterAgent() const				{ return localToAgent( getCenterLocal() ); }
-
-	LLVector3			getExtentLocal() const				{ return mMaxLocal - mMinLocal; }
-
-	bool				containsPointLocal(const LLVector3& p) const;
-	bool				containsPointAgent(const LLVector3& p) const;
-
-	void				addPointAgent(LLVector3 p);
-	void				addBBoxAgent(const LLBBox& b);
-	
-	void				addPointLocal(const LLVector3& p);
-	void				addBBoxLocal(const LLBBox& b) {	addPointLocal( b.mMinLocal ); addPointLocal( b.mMaxLocal ); }
-
-	void				expand( F32 delta );
-
-	LLVector3			localToAgent( const LLVector3& v ) const;
-	LLVector3			agentToLocal( const LLVector3& v ) const;
-
-	// Changes rotation but not position
-	LLVector3			localToAgentBasis(const LLVector3& v) const;
-	LLVector3			agentToLocalBasis(const LLVector3& v) const;
-
-	// Get the smallest possible axis aligned bbox that contains this bbox
-	LLBBox              getAxisAligned() const;
-
-//	friend LLBBox operator*(const LLBBox& a, const LLMatrix4& b);
-
-private:
-	LLVector3			mMinLocal;
-	LLVector3			mMaxLocal;
-	LLVector3			mPosAgent;  // Position relative to Agent's Region
-	LLQuaternion		mRotation;
-	bool				mEmpty;		// Nothing has been added to this bbox yet
-};
-
-//LLBBox operator*(const LLBBox &a, const LLMatrix4 &b);
-
-
-#endif  // LL_BBOX_H
+/**

+ * @file llbbox.h

+ * @brief General purpose bounding box class

+ *

+ * $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$

+ */

+

+#ifndef LL_BBOX_H

+#define LL_BBOX_H

+

+#include "v3math.h"

+#include "llquaternion.h"

+

+// Note: "local space" for an LLBBox is defined relative to agent space in terms of

+// a translation followed by a rotation.  There is no scale term since the LLBBox's min and

+// max are not necessarily symetrical and define their own extents.

+

+class LLBBox

+{

+public:

+    LLBBox() {mEmpty = true;}

+    LLBBox( const LLVector3& pos_agent,

+        const LLQuaternion& rot,

+        const LLVector3& min_local,

+        const LLVector3& max_local )

+        :

+        mMinLocal( min_local ), mMaxLocal( max_local ), mPosAgent(pos_agent), mRotation( rot), mEmpty( true )

+        {}

+

+    // Default copy constructor is OK.

+

+    const LLVector3&    getPositionAgent() const            { return mPosAgent; }

+    const LLQuaternion& getRotation() const                 { return mRotation; }

+

+    LLVector3           getMinAgent() const;

+    const LLVector3&    getMinLocal() const                 { return mMinLocal; }

+    void                setMinLocal( const LLVector3& min ) { mMinLocal = min; }

+

+    LLVector3           getMaxAgent() const;

+    const LLVector3&    getMaxLocal() const                 { return mMaxLocal; }

+    void                setMaxLocal( const LLVector3& max ) { mMaxLocal = max; }

+

+    LLVector3           getCenterLocal() const              { return (mMaxLocal - mMinLocal) * 0.5f + mMinLocal; }

+    LLVector3           getCenterAgent() const              { return localToAgent( getCenterLocal() ); }

+

+    LLVector3           getExtentLocal() const              { return mMaxLocal - mMinLocal; }

+

+    bool                containsPointLocal(const LLVector3& p) const;

+    bool                containsPointAgent(const LLVector3& p) const;

+

+    void                addPointAgent(LLVector3 p);

+    void                addBBoxAgent(const LLBBox& b);

+

+    void                addPointLocal(const LLVector3& p);

+    void                addBBoxLocal(const LLBBox& b) { addPointLocal( b.mMinLocal ); addPointLocal( b.mMaxLocal ); }

+

+    void                expand( F32 delta );

+

+    LLVector3           localToAgent( const LLVector3& v ) const;

+    LLVector3           agentToLocal( const LLVector3& v ) const;

+

+    // Changes rotation but not position

+    LLVector3           localToAgentBasis(const LLVector3& v) const;

+    LLVector3           agentToLocalBasis(const LLVector3& v) const;

+

+    // Get the smallest possible axis aligned bbox that contains this bbox

+    LLBBox              getAxisAligned() const;

+

+//  friend LLBBox operator*(const LLBBox& a, const LLMatrix4& b);

+

+private:

+    LLVector3           mMinLocal;

+    LLVector3           mMaxLocal;

+    LLVector3           mPosAgent;  // Position relative to Agent's Region

+    LLQuaternion        mRotation;

+    bool                mEmpty;     // Nothing has been added to this bbox yet

+};

+

+//LLBBox operator*(const LLBBox &a, const LLMatrix4 &b);

+

+

+#endif  // LL_BBOX_H