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

diff --git a/indra/llappearance/llpolyskeletaldistortion.h b/indra/llappearance/llpolyskeletaldistortion.h
index 4c69f7e70a..252ed70b7f 100644
--- a/indra/llappearance/llpolyskeletaldistortion.h
+++ b/indra/llappearance/llpolyskeletaldistortion.h
@@ -1,123 +1,123 @@
-/** 
- * @file llpolyskeletaldistortion.h
- * @brief Implementation of LLPolyMesh 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_LLPOLYSKELETALDISTORTION_H
-#define LL_LLPOLYSKELETALDISTORTION_H
-
-#include "llcommon.h"
-
-#include <string>
-#include <map>
-#include "llstl.h"
-
-#include "v3math.h"
-#include "v2math.h"
-#include "llquaternion.h"
-//#include "llpolymorph.h"
-#include "lljoint.h"
-#include "llviewervisualparam.h"
-
-//class LLSkinJoint;
-class LLAvatarAppearance;
-
-//#define USE_STRIPS	// Use tri-strips for rendering.
-
-//-----------------------------------------------------------------------------
-// LLPolySkeletalDeformationInfo
-// Shared information for LLPolySkeletalDeformations
-//-----------------------------------------------------------------------------
-struct LLPolySkeletalBoneInfo
-{
-	LLPolySkeletalBoneInfo(std::string &name, LLVector3 &scale, LLVector3 &pos, bool haspos)
-		: mBoneName(name),
-		  mScaleDeformation(scale),
-		  mPositionDeformation(pos),
-		  mHasPositionDeformation(haspos) {}
-	std::string mBoneName;
-	LLVector3 mScaleDeformation;
-	LLVector3 mPositionDeformation;
-	bool mHasPositionDeformation;
-};
-
-class alignas(16) LLPolySkeletalDistortionInfo : public LLViewerVisualParamInfo
-{
-    LL_ALIGN_NEW
-	friend class LLPolySkeletalDistortion;
-public:
-	
-	LLPolySkeletalDistortionInfo();
-	/*virtual*/ ~LLPolySkeletalDistortionInfo() {};
-	
-	/*virtual*/ bool parseXml(LLXmlTreeNode* node);
-
-protected:
-	typedef std::vector<LLPolySkeletalBoneInfo> bone_info_list_t;
-	bone_info_list_t mBoneInfoList;
-};
-
-//-----------------------------------------------------------------------------
-// LLPolySkeletalDeformation
-// A set of joint scale data for deforming the avatar mesh
-//-----------------------------------------------------------------------------
-class alignas(16) LLPolySkeletalDistortion : public LLViewerVisualParam
-{
-    LL_ALIGN_NEW
-public:
-	LLPolySkeletalDistortion(LLAvatarAppearance *avatarp);
-	~LLPolySkeletalDistortion();
-
-	// Special: These functions are overridden by child classes
-	LLPolySkeletalDistortionInfo*	getInfo() const { return (LLPolySkeletalDistortionInfo*)mInfo; }
-	//   This sets mInfo and calls initialization functions
-	bool							setInfo(LLPolySkeletalDistortionInfo *info);
-
-	/*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
-
-	// LLVisualParam Virtual functions
-	///*virtual*/ bool				parseData(LLXmlTreeNode* node);
-	/*virtual*/ void				apply( ESex sex );
-	
-	// LLViewerVisualParam Virtual functions
-	/*virtual*/ F32					getTotalDistortion() { return 0.1f; }
-	/*virtual*/ const LLVector4a&	getAvgDistortion()	{ return mDefaultVec; }
-	/*virtual*/ F32					getMaxDistortion() { return 0.1f; }
-	/*virtual*/ LLVector4a			getVertexDistortion(S32 index, LLPolyMesh *poly_mesh){return LLVector4a(0.001f, 0.001f, 0.001f);}
-	/*virtual*/ const LLVector4a*	getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return &mDefaultVec;};
-	/*virtual*/ const LLVector4a*	getNextDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return NULL;};
-
-protected:
-	LLPolySkeletalDistortion(const LLPolySkeletalDistortion& pOther);
-
-	LL_ALIGN_16(LLVector4a mDefaultVec);
-	typedef std::map<LLJoint*, LLVector3> joint_vec_map_t;
-	joint_vec_map_t mJointScales;
-	joint_vec_map_t mJointOffsets;
-	// Backlink only; don't make this an LLPointer.
-	LLAvatarAppearance *mAvatar;
-} LL_ALIGN_POSTFIX(16);
-
-#endif // LL_LLPOLYSKELETALDISTORTION_H
-
+/**

+ * @file llpolyskeletaldistortion.h

+ * @brief Implementation of LLPolyMesh 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_LLPOLYSKELETALDISTORTION_H

+#define LL_LLPOLYSKELETALDISTORTION_H

+

+#include "llcommon.h"

+

+#include <string>

+#include <map>

+#include "llstl.h"

+

+#include "v3math.h"

+#include "v2math.h"

+#include "llquaternion.h"

+//#include "llpolymorph.h"

+#include "lljoint.h"

+#include "llviewervisualparam.h"

+

+//class LLSkinJoint;

+class LLAvatarAppearance;

+

+//#define USE_STRIPS    // Use tri-strips for rendering.

+

+//-----------------------------------------------------------------------------

+// LLPolySkeletalDeformationInfo

+// Shared information for LLPolySkeletalDeformations

+//-----------------------------------------------------------------------------

+struct LLPolySkeletalBoneInfo

+{

+    LLPolySkeletalBoneInfo(std::string &name, LLVector3 &scale, LLVector3 &pos, bool haspos)

+        : mBoneName(name),

+          mScaleDeformation(scale),

+          mPositionDeformation(pos),

+          mHasPositionDeformation(haspos) {}

+    std::string mBoneName;

+    LLVector3 mScaleDeformation;

+    LLVector3 mPositionDeformation;

+    bool mHasPositionDeformation;

+};

+

+class alignas(16) LLPolySkeletalDistortionInfo : public LLViewerVisualParamInfo

+{

+    LL_ALIGN_NEW

+    friend class LLPolySkeletalDistortion;

+public:

+

+    LLPolySkeletalDistortionInfo();

+    /*virtual*/ ~LLPolySkeletalDistortionInfo() {};

+

+    /*virtual*/ bool parseXml(LLXmlTreeNode* node);

+

+protected:

+    typedef std::vector<LLPolySkeletalBoneInfo> bone_info_list_t;

+    bone_info_list_t mBoneInfoList;

+};

+

+//-----------------------------------------------------------------------------

+// LLPolySkeletalDeformation

+// A set of joint scale data for deforming the avatar mesh

+//-----------------------------------------------------------------------------

+class alignas(16) LLPolySkeletalDistortion : public LLViewerVisualParam

+{

+    LL_ALIGN_NEW

+public:

+    LLPolySkeletalDistortion(LLAvatarAppearance *avatarp);

+    ~LLPolySkeletalDistortion();

+

+    // Special: These functions are overridden by child classes

+    LLPolySkeletalDistortionInfo*   getInfo() const { return (LLPolySkeletalDistortionInfo*)mInfo; }

+    //   This sets mInfo and calls initialization functions

+    bool                            setInfo(LLPolySkeletalDistortionInfo *info);

+

+    /*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;

+

+    // LLVisualParam Virtual functions

+    ///*virtual*/ bool              parseData(LLXmlTreeNode* node);

+    /*virtual*/ void                apply( ESex sex );

+

+    // LLViewerVisualParam Virtual functions

+    /*virtual*/ F32                 getTotalDistortion() { return 0.1f; }

+    /*virtual*/ const LLVector4a&   getAvgDistortion()  { return mDefaultVec; }

+    /*virtual*/ F32                 getMaxDistortion() { return 0.1f; }

+    /*virtual*/ LLVector4a          getVertexDistortion(S32 index, LLPolyMesh *poly_mesh){return LLVector4a(0.001f, 0.001f, 0.001f);}

+    /*virtual*/ const LLVector4a*   getFirstDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return &mDefaultVec;};

+    /*virtual*/ const LLVector4a*   getNextDistortion(U32 *index, LLPolyMesh **poly_mesh){index = 0; poly_mesh = NULL; return NULL;};

+

+protected:

+    LLPolySkeletalDistortion(const LLPolySkeletalDistortion& pOther);

+

+    LL_ALIGN_16(LLVector4a mDefaultVec);

+    typedef std::map<LLJoint*, LLVector3> joint_vec_map_t;

+    joint_vec_map_t mJointScales;

+    joint_vec_map_t mJointOffsets;

+    // Backlink only; don't make this an LLPointer.

+    LLAvatarAppearance *mAvatar;

+} LL_ALIGN_POSTFIX(16);

+

+#endif // LL_LLPOLYSKELETALDISTORTION_H

+