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

diff --git a/indra/llappearance/lldriverparam.h b/indra/llappearance/lldriverparam.h
index 610cd8c5e5..52f088f2d2 100644
--- a/indra/llappearance/lldriverparam.h
+++ b/indra/llappearance/lldriverparam.h
@@ -1,139 +1,139 @@
-/** 
- * @file lldriverparam.h
- * @brief A visual parameter that drives (controls) other visual parameters.
- *
- * $LicenseInfo:firstyear=2002&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_LLDRIVERPARAM_H
-#define LL_LLDRIVERPARAM_H
-
-#include "llviewervisualparam.h"
-#include "llwearabletype.h"
-#include <deque>
-
-class LLAvatarAppearance;
-class LLDriverParam;
-class LLWearable;
-
-//-----------------------------------------------------------------------------
-
-struct LLDrivenEntryInfo
-{
-	LLDrivenEntryInfo( S32 id, F32 min1, F32 max1, F32 max2, F32 min2 )
-		: mDrivenID( id ), mMin1( min1 ), mMax1( max1 ), mMax2( max2 ), mMin2( min2 ) {}
-	S32					mDrivenID;
-	F32					mMin1;
-	F32					mMax1;
-	F32					mMax2;
-	F32					mMin2;
-};
-
-struct LLDrivenEntry
-{
-	LLDrivenEntry( LLViewerVisualParam* param, LLDrivenEntryInfo *info )
-		: mParam( param ), mInfo( info ) {}
-	LLViewerVisualParam* mParam;
-	LLDrivenEntryInfo*	 mInfo;
-};
-
-//-----------------------------------------------------------------------------
-
-class LLDriverParamInfo : public LLViewerVisualParamInfo
-{
-	friend class LLDriverParam;
-public:
-	LLDriverParamInfo();
-	/*virtual*/ ~LLDriverParamInfo() {};
-	
-	/*virtual*/ bool parseXml(LLXmlTreeNode* node);
-
-	/*virtual*/ void toStream(std::ostream &out);	
-
-protected:
-	typedef std::deque<LLDrivenEntryInfo> entry_info_list_t;
-	entry_info_list_t mDrivenInfoList;
-	LLDriverParam* mDriverParam; // backpointer
-};
-
-//-----------------------------------------------------------------------------
-
-class alignas(16) LLDriverParam : public LLViewerVisualParam
-{
-    LL_ALIGN_NEW
-private:
-    // Hide the default constructor.  Force construction with LLAvatarAppearance.
-    LLDriverParam() {}
-public:
-    LLDriverParam(LLAvatarAppearance* appearance, LLWearable* wearable = NULL);
-    ~LLDriverParam();
-
-    // Special: These functions are overridden by child classes
-    LLDriverParamInfo* getInfo() const { return (LLDriverParamInfo*)mInfo; }
-    //   This sets mInfo and calls initialization functions
-    bool					setInfo(LLDriverParamInfo* info);
-
-    LLAvatarAppearance* getAvatarAppearance() { return mAvatarAppearance; }
-    const LLAvatarAppearance* getAvatarAppearance() const { return mAvatarAppearance; }
-
-    void					updateCrossDrivenParams(LLWearableType::EType driven_type);
-
-    /*virtual*/ LLViewerVisualParam* cloneParam(LLWearable* wearable) const;
-
-    // LLVisualParam Virtual functions
-    /*virtual*/ void				apply(ESex sex) {} // apply is called separately for each driven param.
-    /*virtual*/ void				setWeight(F32 weight);
-    /*virtual*/ void				setAnimationTarget(F32 target_value);
-    /*virtual*/ void				stopAnimating();
-    /*virtual*/ bool				linkDrivenParams(visual_param_mapper mapper, bool only_cross_params);
-    /*virtual*/ void				resetDrivenParams();
-
-    // LLViewerVisualParam Virtual functions
-    /*virtual*/ F32					getTotalDistortion();
-    /*virtual*/ const LLVector4a& getAvgDistortion();
-    /*virtual*/ F32					getMaxDistortion();
-    /*virtual*/ LLVector4a			getVertexDistortion(S32 index, LLPolyMesh* poly_mesh);
-    /*virtual*/ const LLVector4a* getFirstDistortion(U32* index, LLPolyMesh** poly_mesh);
-    /*virtual*/ const LLVector4a* getNextDistortion(U32* index, LLPolyMesh** poly_mesh);
-
-    S32								getDrivenParamsCount() const;
-    const LLViewerVisualParam* getDrivenParam(S32 index) const;
-
-    typedef std::vector<LLDrivenEntry> entry_list_t;
-    entry_list_t& getDrivenList() { return mDriven; }
-    void                            setDrivenList(entry_list_t& driven_list) { mDriven = driven_list; }
-
-protected:
-    LLDriverParam(const LLDriverParam& pOther);
-    F32 getDrivenWeight(const LLDrivenEntry* driven, F32 input_weight);
-    void setDrivenWeight(LLDrivenEntry* driven, F32 driven_weight);
-
-
-    LL_ALIGN_16(LLVector4a	mDefaultVec); // temp holder
-    entry_list_t mDriven;
-    LLViewerVisualParam* mCurrentDistortionParam;
-    // Backlink only; don't make this an LLPointer.
-    LLAvatarAppearance* mAvatarAppearance;
-    LLWearable* mWearablep;
-};
-
-#endif  // LL_LLDRIVERPARAM_H
+/**

+ * @file lldriverparam.h

+ * @brief A visual parameter that drives (controls) other visual parameters.

+ *

+ * $LicenseInfo:firstyear=2002&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_LLDRIVERPARAM_H

+#define LL_LLDRIVERPARAM_H

+

+#include "llviewervisualparam.h"

+#include "llwearabletype.h"

+#include <deque>

+

+class LLAvatarAppearance;

+class LLDriverParam;

+class LLWearable;

+

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

+

+struct LLDrivenEntryInfo

+{

+    LLDrivenEntryInfo( S32 id, F32 min1, F32 max1, F32 max2, F32 min2 )

+        : mDrivenID( id ), mMin1( min1 ), mMax1( max1 ), mMax2( max2 ), mMin2( min2 ) {}

+    S32                 mDrivenID;

+    F32                 mMin1;

+    F32                 mMax1;

+    F32                 mMax2;

+    F32                 mMin2;

+};

+

+struct LLDrivenEntry

+{

+    LLDrivenEntry( LLViewerVisualParam* param, LLDrivenEntryInfo *info )

+        : mParam( param ), mInfo( info ) {}

+    LLViewerVisualParam* mParam;

+    LLDrivenEntryInfo*   mInfo;

+};

+

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

+

+class LLDriverParamInfo : public LLViewerVisualParamInfo

+{

+    friend class LLDriverParam;

+public:

+    LLDriverParamInfo();

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

+

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

+

+    /*virtual*/ void toStream(std::ostream &out);

+

+protected:

+    typedef std::deque<LLDrivenEntryInfo> entry_info_list_t;

+    entry_info_list_t mDrivenInfoList;

+    LLDriverParam* mDriverParam; // backpointer

+};

+

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

+

+class alignas(16) LLDriverParam : public LLViewerVisualParam

+{

+    LL_ALIGN_NEW

+private:

+    // Hide the default constructor.  Force construction with LLAvatarAppearance.

+    LLDriverParam() {}

+public:

+    LLDriverParam(LLAvatarAppearance* appearance, LLWearable* wearable = NULL);

+    ~LLDriverParam();

+

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

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

+    //   This sets mInfo and calls initialization functions

+    bool                    setInfo(LLDriverParamInfo* info);

+

+    LLAvatarAppearance* getAvatarAppearance() { return mAvatarAppearance; }

+    const LLAvatarAppearance* getAvatarAppearance() const { return mAvatarAppearance; }

+

+    void                    updateCrossDrivenParams(LLWearableType::EType driven_type);

+

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

+

+    // LLVisualParam Virtual functions

+    /*virtual*/ void                apply(ESex sex) {} // apply is called separately for each driven param.

+    /*virtual*/ void                setWeight(F32 weight);

+    /*virtual*/ void                setAnimationTarget(F32 target_value);

+    /*virtual*/ void                stopAnimating();

+    /*virtual*/ bool                linkDrivenParams(visual_param_mapper mapper, bool only_cross_params);

+    /*virtual*/ void                resetDrivenParams();

+

+    // LLViewerVisualParam Virtual functions

+    /*virtual*/ F32                 getTotalDistortion();

+    /*virtual*/ const LLVector4a& getAvgDistortion();

+    /*virtual*/ F32                 getMaxDistortion();

+    /*virtual*/ LLVector4a          getVertexDistortion(S32 index, LLPolyMesh* poly_mesh);

+    /*virtual*/ const LLVector4a* getFirstDistortion(U32* index, LLPolyMesh** poly_mesh);

+    /*virtual*/ const LLVector4a* getNextDistortion(U32* index, LLPolyMesh** poly_mesh);

+

+    S32                             getDrivenParamsCount() const;

+    const LLViewerVisualParam* getDrivenParam(S32 index) const;

+

+    typedef std::vector<LLDrivenEntry> entry_list_t;

+    entry_list_t& getDrivenList() { return mDriven; }

+    void                            setDrivenList(entry_list_t& driven_list) { mDriven = driven_list; }

+

+protected:

+    LLDriverParam(const LLDriverParam& pOther);

+    F32 getDrivenWeight(const LLDrivenEntry* driven, F32 input_weight);

+    void setDrivenWeight(LLDrivenEntry* driven, F32 driven_weight);

+

+

+    LL_ALIGN_16(LLVector4a  mDefaultVec); // temp holder

+    entry_list_t mDriven;

+    LLViewerVisualParam* mCurrentDistortionParam;

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

+    LLAvatarAppearance* mAvatarAppearance;

+    LLWearable* mWearablep;

+};

+

+#endif  // LL_LLDRIVERPARAM_H