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

diff --git a/indra/newview/llscrollingpanelparam.h b/indra/newview/llscrollingpanelparam.h
index 1ebf89f483..c62ee4e62c 100644
--- a/indra/newview/llscrollingpanelparam.h
+++ b/indra/newview/llscrollingpanelparam.h
@@ -1,94 +1,94 @@
-/** 
- * @file llscrollingpanelparam.h
- * @brief the scrolling panel containing a list of visual param 
- *  	  panels
- *
- * $LicenseInfo:firstyear=2009&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_SCROLLINGPANELPARAM_H
-#define LL_SCROLLINGPANELPARAM_H
-
-#include "llscrollingpanelparambase.h"
-
-class LLBorder;
-class LLButton;
-class LLViewerJointMesh;
-class LLViewerVisualParam;
-class LLWearable;
-class LLVisualParamHint;
-class LLViewerVisualParam;
-class LLJoint;
-
-class LLScrollingPanelParam : public LLScrollingPanelParamBase
-{
-public:
-	LLScrollingPanelParam( const LLPanel::Params& panel_params,
-			       LLViewerJointMesh* mesh, LLViewerVisualParam* param, bool allow_modify, LLWearable* wearable, LLJoint* jointp, bool use_hints = true );
-	virtual ~LLScrollingPanelParam();
-
-	void				draw() override;
-	void				setVisible(bool visible) override;
-	void				updatePanel(bool allow_modify) override;
-
-	static void			onSliderMouseDown(LLUICtrl* ctrl, void* userdata);
-	static void			onSliderMouseUp(LLUICtrl* ctrl, void* userdata);
-
-	static void			onHintMinMouseDown(void* userdata);
-	static void			onHintMinHeldDown(void* userdata);
-	static void			onHintMaxMouseDown(void* userdata);
-	static void			onHintMaxHeldDown(void* userdata);
-	static void			onHintMinMouseUp(void* userdata);
-	static void			onHintMaxMouseUp(void* userdata);
-
-	void				onHintMouseDown( LLVisualParamHint* hint );
-	void				onHintHeldDown( LLVisualParamHint* hint );
-
-	F32					weightToPercent( F32 weight );
-	F32					percentToWeight( F32 percent );
-
-public:
-	// Constants for LLPanelVisualParam
-	const static F32 PARAM_STEP_TIME_THRESHOLD;
-	
-	const static S32 PARAM_HINT_WIDTH;
-	const static S32 PARAM_HINT_HEIGHT;
-
-public:
-	LLPointer<LLVisualParamHint>	mHintMin;
-	LLPointer<LLVisualParamHint>	mHintMax;
-	static S32 			sUpdateDelayFrames;
-	
-protected:
-	LLTimer				mMouseDownTimer;	// timer for how long mouse has been held down on a hint.
-	F32					mLastHeldTime;
-	bool mAllowModify;
-
-    LLButton* mLessBtn;
-    LLButton* mMoreBtn;
-    LLViewBorder* mLeftBorder;
-    LLViewBorder* mRightBorder;
-    LLUICtrl* mMinParamText;
-    LLUICtrl* mMaxParamText;
-}; 
-
-#endif
+/**

+ * @file llscrollingpanelparam.h

+ * @brief the scrolling panel containing a list of visual param

+ *        panels

+ *

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

+#define LL_SCROLLINGPANELPARAM_H

+

+#include "llscrollingpanelparambase.h"

+

+class LLBorder;

+class LLButton;

+class LLViewerJointMesh;

+class LLViewerVisualParam;

+class LLWearable;

+class LLVisualParamHint;

+class LLViewerVisualParam;

+class LLJoint;

+

+class LLScrollingPanelParam : public LLScrollingPanelParamBase

+{

+public:

+    LLScrollingPanelParam( const LLPanel::Params& panel_params,

+                   LLViewerJointMesh* mesh, LLViewerVisualParam* param, bool allow_modify, LLWearable* wearable, LLJoint* jointp, bool use_hints = true );

+    virtual ~LLScrollingPanelParam();

+

+    void                draw() override;

+    void                setVisible(bool visible) override;

+    void                updatePanel(bool allow_modify) override;

+

+    static void         onSliderMouseDown(LLUICtrl* ctrl, void* userdata);

+    static void         onSliderMouseUp(LLUICtrl* ctrl, void* userdata);

+

+    static void         onHintMinMouseDown(void* userdata);

+    static void         onHintMinHeldDown(void* userdata);

+    static void         onHintMaxMouseDown(void* userdata);

+    static void         onHintMaxHeldDown(void* userdata);

+    static void         onHintMinMouseUp(void* userdata);

+    static void         onHintMaxMouseUp(void* userdata);

+

+    void                onHintMouseDown( LLVisualParamHint* hint );

+    void                onHintHeldDown( LLVisualParamHint* hint );

+

+    F32                 weightToPercent( F32 weight );

+    F32                 percentToWeight( F32 percent );

+

+public:

+    // Constants for LLPanelVisualParam

+    const static F32 PARAM_STEP_TIME_THRESHOLD;

+

+    const static S32 PARAM_HINT_WIDTH;

+    const static S32 PARAM_HINT_HEIGHT;

+

+public:

+    LLPointer<LLVisualParamHint>    mHintMin;

+    LLPointer<LLVisualParamHint>    mHintMax;

+    static S32          sUpdateDelayFrames;

+

+protected:

+    LLTimer             mMouseDownTimer;    // timer for how long mouse has been held down on a hint.

+    F32                 mLastHeldTime;

+    bool mAllowModify;

+

+    LLButton* mLessBtn;

+    LLButton* mMoreBtn;

+    LLViewBorder* mLeftBorder;

+    LLViewBorder* mRightBorder;

+    LLUICtrl* mMinParamText;

+    LLUICtrl* mMaxParamText;

+};

+

+#endif