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

diff --git a/indra/newview/lltoolmorph.h b/indra/newview/lltoolmorph.h
index 7bcb8b4e02..344cd52cb0 100644
--- a/indra/newview/lltoolmorph.h
+++ b/indra/newview/lltoolmorph.h
@@ -1,117 +1,117 @@
-/** 
- * @file lltoolmorph.h
- * @brief A tool to select object faces.
- *
- * $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_LLTOOLMORPH_H
-#define LL_LLTOOLMORPH_H
-
-#include "lltool.h"
-#include "m4math.h"
-#include "v2math.h"
-#include "lldynamictexture.h"
-#include "llundo.h"
-#include "lltextbox.h"
-#include "llstrider.h"
-#include "llviewervisualparam.h"
-#include "llframetimer.h"
-#include "llviewertexture.h"
-
-class LLViewerJointMesh;
-class LLPolyMesh;
-class LLViewerObject;
-class LLJoint;
-
-//-----------------------------------------------------------------------------
-// LLVisualParamHint
-//-----------------------------------------------------------------------------
-class LLVisualParamHint : public LLViewerDynamicTexture
-{
-protected:
-	virtual ~LLVisualParamHint();
-
-public:
-	LLVisualParamHint(
-		S32 pos_x, S32 pos_y,
-		S32 width, S32 height, 
-		LLViewerJointMesh *mesh, 
-		LLViewerVisualParam *param,
-		LLWearable *wearable,
-		F32 param_weight, 
-		LLJoint* jointp);	
-
-	/*virtual*/ S8 getType() const ;
-
-	bool					needsRender();
-	void					preRender(bool clear_depth);
-	bool					render();
-	void					requestUpdate( S32 delay_frames ) {mNeedsUpdate = true; mDelayFrames = delay_frames; }
-	void					setUpdateDelayFrames( S32 delay_frames ) { mDelayFrames = delay_frames; }
-	void					draw(F32 alpha);
-	
-	LLViewerVisualParam*	getVisualParam() { return mVisualParam; }
-	F32						getVisualParamWeight() { return mVisualParamWeight; }
-	bool					getVisible() { return mIsVisible; }
-
-	void					setAllowsUpdates( bool b ) { mAllowsUpdates = b; }
-
-	const LLRect&			getRect()	{ return mRect; }
-
-	// Requests updates for all instances (excluding two possible exceptions)  Grungy but efficient.
-	static void				requestHintUpdates( LLVisualParamHint* exception1 = NULL, LLVisualParamHint* exception2 = NULL );
-
-protected:
-	bool					mNeedsUpdate;		// does this texture need to be re-rendered?
-	bool					mIsVisible;			// is this distortion hint visible?
-	LLViewerJointMesh*		mJointMesh;			// mesh that this distortion applies to
-	LLViewerVisualParam*	mVisualParam;		// visual param applied by this hint
-	LLWearable*				mWearablePtr;		// wearable we're editing
-	F32						mVisualParamWeight;		// weight for this visual parameter
-	bool					mAllowsUpdates;		// updates are blocked unless this is true
-	S32						mDelayFrames;		// updates are blocked for this many frames
-	LLRect					mRect;
-	F32						mLastParamWeight;
-	LLJoint*				mCamTargetJoint;	// joint to target with preview camera
-
-	LLUIImagePtr mBackgroundp;
-
-	typedef std::set< LLVisualParamHint* > instance_list_t;
-	static instance_list_t sInstances;
-};
-
-// this class resets avatar data at the end of an update cycle
-class LLVisualParamReset : public LLViewerDynamicTexture
-{
-protected:
-	/*virtual */ ~LLVisualParamReset(){}
-public:
-	LLVisualParamReset();
-	/*virtual */ bool render();
-	/*virtual*/ S8 getType() const ;
-
-	static bool sDirty;
-};
-
-#endif
-
+/**

+ * @file lltoolmorph.h

+ * @brief A tool to select object faces.

+ *

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

+#define LL_LLTOOLMORPH_H

+

+#include "lltool.h"

+#include "m4math.h"

+#include "v2math.h"

+#include "lldynamictexture.h"

+#include "llundo.h"

+#include "lltextbox.h"

+#include "llstrider.h"

+#include "llviewervisualparam.h"

+#include "llframetimer.h"

+#include "llviewertexture.h"

+

+class LLViewerJointMesh;

+class LLPolyMesh;

+class LLViewerObject;

+class LLJoint;

+

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

+// LLVisualParamHint

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

+class LLVisualParamHint : public LLViewerDynamicTexture

+{

+protected:

+    virtual ~LLVisualParamHint();

+

+public:

+    LLVisualParamHint(

+        S32 pos_x, S32 pos_y,

+        S32 width, S32 height,

+        LLViewerJointMesh *mesh,

+        LLViewerVisualParam *param,

+        LLWearable *wearable,

+        F32 param_weight,

+        LLJoint* jointp);

+

+    /*virtual*/ S8 getType() const ;

+

+    bool                    needsRender();

+    void                    preRender(bool clear_depth);

+    bool                    render();

+    void                    requestUpdate( S32 delay_frames ) {mNeedsUpdate = true; mDelayFrames = delay_frames; }

+    void                    setUpdateDelayFrames( S32 delay_frames ) { mDelayFrames = delay_frames; }

+    void                    draw(F32 alpha);

+

+    LLViewerVisualParam*    getVisualParam() { return mVisualParam; }

+    F32                     getVisualParamWeight() { return mVisualParamWeight; }

+    bool                    getVisible() { return mIsVisible; }

+

+    void                    setAllowsUpdates( bool b ) { mAllowsUpdates = b; }

+

+    const LLRect&           getRect()   { return mRect; }

+

+    // Requests updates for all instances (excluding two possible exceptions)  Grungy but efficient.

+    static void             requestHintUpdates( LLVisualParamHint* exception1 = NULL, LLVisualParamHint* exception2 = NULL );

+

+protected:

+    bool                    mNeedsUpdate;       // does this texture need to be re-rendered?

+    bool                    mIsVisible;         // is this distortion hint visible?

+    LLViewerJointMesh*      mJointMesh;         // mesh that this distortion applies to

+    LLViewerVisualParam*    mVisualParam;       // visual param applied by this hint

+    LLWearable*             mWearablePtr;       // wearable we're editing

+    F32                     mVisualParamWeight;     // weight for this visual parameter

+    bool                    mAllowsUpdates;     // updates are blocked unless this is true

+    S32                     mDelayFrames;       // updates are blocked for this many frames

+    LLRect                  mRect;

+    F32                     mLastParamWeight;

+    LLJoint*                mCamTargetJoint;    // joint to target with preview camera

+

+    LLUIImagePtr mBackgroundp;

+

+    typedef std::set< LLVisualParamHint* > instance_list_t;

+    static instance_list_t sInstances;

+};

+

+// this class resets avatar data at the end of an update cycle

+class LLVisualParamReset : public LLViewerDynamicTexture

+{

+protected:

+    /*virtual */ ~LLVisualParamReset(){}

+public:

+    LLVisualParamReset();

+    /*virtual */ bool render();

+    /*virtual*/ S8 getType() const ;

+

+    static bool sDirty;

+};

+

+#endif

+