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

diff --git a/indra/newview/llphysicsshapebuilderutil.h b/indra/newview/llphysicsshapebuilderutil.h
index 7dbc577562..506a71af4b 100644
--- a/indra/newview/llphysicsshapebuilderutil.h
+++ b/indra/newview/llphysicsshapebuilderutil.h
@@ -1,142 +1,142 @@
-/** 
- * @file llphysicsshapebuilder.h
- * @brief Generic system to convert LL(Physics)VolumeParams to physics shapes
- *
- * $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_PHYSICS_SHAPE_BUILDER_H
-#define LL_PHYSICS_SHAPE_BUILDER_H
-
-#include "indra_constants.h"
-#include "llvolume.h"
-
-#define USE_SHAPE_QUANTIZATION 0
-
-#define SHAPE_BUILDER_DEFAULT_VOLUME_DETAIL 1
-
-#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_HOLLOW 0.10f
-#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_HOLLOW_SPHERES 0.90f
-#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_PATH_CUT 0.05f
-#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_TAPER 0.05f
-#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_TWIST 0.09f
-#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_SHEAR 0.05f
-
-const F32 COLLISION_TOLERANCE = 0.1f;
-
-const F32 SHAPE_BUILDER_ENTRY_SNAP_SCALE_BIN_SIZE = 0.15f;
-const F32 SHAPE_BUILDER_ENTRY_SNAP_PARAMETER_BIN_SIZE = 0.010f;
-const F32 SHAPE_BUILDER_CONVEXIFICATION_SIZE = 2.f * COLLISION_TOLERANCE;
-const F32 SHAPE_BUILDER_MIN_GEOMETRY_SIZE = 0.5f * COLLISION_TOLERANCE;
-const F32 SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE = 0.5f;
-
-class LLPhysicsVolumeParams : public LLVolumeParams
-{
-public:
-
-	LLPhysicsVolumeParams( const LLVolumeParams& params, bool forceConvex ) : 
-		LLVolumeParams( params ),
-		mForceConvex(forceConvex) {}
-
-	bool operator==(const LLPhysicsVolumeParams &params) const
-	{
-		return ( LLVolumeParams::operator==(params) && (mForceConvex == params.mForceConvex) );
-	}
-
-	bool operator!=(const LLPhysicsVolumeParams &params) const
-	{
-		return !operator==(params);
-	}
-
-	bool operator<(const LLPhysicsVolumeParams &params) const
-	{
-		if ( LLVolumeParams::operator!=(params) )
-		{
-			return LLVolumeParams::operator<(params);
-		}
-
-		return !params.mForceConvex && mForceConvex;	
-	}
-
-	bool shouldForceConvex() const { return mForceConvex; }
-
-private:
-	bool mForceConvex;
-};
-
-
-class LLPhysicsShapeBuilderUtil
-{
-public:
-
-	class PhysicsShapeSpecification
-	{
-	public:
-		enum ShapeType
-		{
-			// Primitive types
-			BOX,
-			SPHERE,
-			CYLINDER,
-
-			USER_CONVEX,	// User specified they wanted the convex hull of the volume
-
-			PRIM_CONVEX,	// Either a volume that is inherently convex but not a primitive type, or a shape
-							// with dimensions such that will convexify it anyway.
-
- 			SCULPT,			// Special case for traditional sculpts--they are the convex hull of a single particular set of volume params
-
-			USER_MESH,		// A user mesh. May or may not contain a convex decomposition.
-
-			PRIM_MESH,		// A non-convex volume which we have to represent accurately
-
-			INVALID
-		};
-
-		PhysicsShapeSpecification() : 
-		mType( INVALID ),
-		mScale( 0.f, 0.f, 0.f ),
-		mCenter( 0.f, 0.f, 0.f ) {}
-		
-		bool isConvex() { return (mType != USER_MESH && mType != PRIM_MESH && mType != INVALID); }
-		bool isMesh() { return (mType == USER_MESH) || (mType == PRIM_MESH); }
-
-		ShapeType getType() { return mType; }
-		const LLVector3& getScale() { return mScale; }
-		const LLVector3& getCenter() { return mCenter; }
-
-	private:
-		friend class LLPhysicsShapeBuilderUtil;
-
-		ShapeType	mType;
-
-		// Dimensions of an AABB around the shape
-		LLVector3	mScale;
-
-		// Offset of shape from origin of primitive's reference frame
-		LLVector3	mCenter;
-	};
-
-	static void determinePhysicsShape( const LLPhysicsVolumeParams& volume_params, const LLVector3& scale, PhysicsShapeSpecification& specOut );
-};
-
-#endif //LL_PHYSICS_SHAPE_BUILDER_H
+/**

+ * @file llphysicsshapebuilder.h

+ * @brief Generic system to convert LL(Physics)VolumeParams to physics shapes

+ *

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

+#define LL_PHYSICS_SHAPE_BUILDER_H

+

+#include "indra_constants.h"

+#include "llvolume.h"

+

+#define USE_SHAPE_QUANTIZATION 0

+

+#define SHAPE_BUILDER_DEFAULT_VOLUME_DETAIL 1

+

+#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_HOLLOW 0.10f

+#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_HOLLOW_SPHERES 0.90f

+#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_PATH_CUT 0.05f

+#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_TAPER 0.05f

+#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_TWIST 0.09f

+#define SHAPE_BUILDER_IMPLICIT_THRESHOLD_SHEAR 0.05f

+

+const F32 COLLISION_TOLERANCE = 0.1f;

+

+const F32 SHAPE_BUILDER_ENTRY_SNAP_SCALE_BIN_SIZE = 0.15f;

+const F32 SHAPE_BUILDER_ENTRY_SNAP_PARAMETER_BIN_SIZE = 0.010f;

+const F32 SHAPE_BUILDER_CONVEXIFICATION_SIZE = 2.f * COLLISION_TOLERANCE;

+const F32 SHAPE_BUILDER_MIN_GEOMETRY_SIZE = 0.5f * COLLISION_TOLERANCE;

+const F32 SHAPE_BUILDER_USER_MESH_CONVEXIFICATION_SIZE = 0.5f;

+

+class LLPhysicsVolumeParams : public LLVolumeParams

+{

+public:

+

+    LLPhysicsVolumeParams( const LLVolumeParams& params, bool forceConvex ) :

+        LLVolumeParams( params ),

+        mForceConvex(forceConvex) {}

+

+    bool operator==(const LLPhysicsVolumeParams &params) const

+    {

+        return ( LLVolumeParams::operator==(params) && (mForceConvex == params.mForceConvex) );

+    }

+

+    bool operator!=(const LLPhysicsVolumeParams &params) const

+    {

+        return !operator==(params);

+    }

+

+    bool operator<(const LLPhysicsVolumeParams &params) const

+    {

+        if ( LLVolumeParams::operator!=(params) )

+        {

+            return LLVolumeParams::operator<(params);

+        }

+

+        return !params.mForceConvex && mForceConvex;

+    }

+

+    bool shouldForceConvex() const { return mForceConvex; }

+

+private:

+    bool mForceConvex;

+};

+

+

+class LLPhysicsShapeBuilderUtil

+{

+public:

+

+    class PhysicsShapeSpecification

+    {

+    public:

+        enum ShapeType

+        {

+            // Primitive types

+            BOX,

+            SPHERE,

+            CYLINDER,

+

+            USER_CONVEX,    // User specified they wanted the convex hull of the volume

+

+            PRIM_CONVEX,    // Either a volume that is inherently convex but not a primitive type, or a shape

+                            // with dimensions such that will convexify it anyway.

+

+            SCULPT,         // Special case for traditional sculpts--they are the convex hull of a single particular set of volume params

+

+            USER_MESH,      // A user mesh. May or may not contain a convex decomposition.

+

+            PRIM_MESH,      // A non-convex volume which we have to represent accurately

+

+            INVALID

+        };

+

+        PhysicsShapeSpecification() :

+        mType( INVALID ),

+        mScale( 0.f, 0.f, 0.f ),

+        mCenter( 0.f, 0.f, 0.f ) {}

+

+        bool isConvex() { return (mType != USER_MESH && mType != PRIM_MESH && mType != INVALID); }

+        bool isMesh() { return (mType == USER_MESH) || (mType == PRIM_MESH); }

+

+        ShapeType getType() { return mType; }

+        const LLVector3& getScale() { return mScale; }

+        const LLVector3& getCenter() { return mCenter; }

+

+    private:

+        friend class LLPhysicsShapeBuilderUtil;

+

+        ShapeType   mType;

+

+        // Dimensions of an AABB around the shape

+        LLVector3   mScale;

+

+        // Offset of shape from origin of primitive's reference frame

+        LLVector3   mCenter;

+    };

+

+    static void determinePhysicsShape( const LLPhysicsVolumeParams& volume_params, const LLVector3& scale, PhysicsShapeSpecification& specOut );

+};

+

+#endif //LL_PHYSICS_SHAPE_BUILDER_H