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

diff --git a/indra/llappearance/llavatarjointmesh.h b/indra/llappearance/llavatarjointmesh.h
index 0d815643e9..273ca4d52c 100644
--- a/indra/llappearance/llavatarjointmesh.h
+++ b/indra/llappearance/llavatarjointmesh.h
@@ -1,141 +1,141 @@
-/** 
- * @file llavatarjointmesh.h
- * @brief Declaration of LLAvatarJointMesh 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_LLAVATARJOINTMESH_H
-#define LL_LLAVATARJOINTMESH_H
-
-#include "llavatarjoint.h"
-#include "llgltexture.h"
-#include "llpolymesh.h"
-#include "v4color.h"
-
-class LLDrawable;
-class LLFace;
-class LLCharacter;
-class LLTexLayerSet;
-
-typedef enum e_avatar_render_pass
-{
-	AVATAR_RENDER_PASS_SINGLE,
-	AVATAR_RENDER_PASS_CLOTHING_INNER,
-	AVATAR_RENDER_PASS_CLOTHING_OUTER
-} EAvatarRenderPass;
-
-class LLSkinJoint
-{
-public:
-	LLSkinJoint();
-	~LLSkinJoint();
-	bool setupSkinJoint( LLAvatarJoint *joint);
-
-	LLAvatarJoint	*mJoint;
-	LLVector3		mRootToJointSkinOffset;
-	LLVector3		mRootToParentJointSkinOffset;
-};
-
-//-----------------------------------------------------------------------------
-// class LLViewerJointMesh
-//-----------------------------------------------------------------------------
-class LLAvatarJointMesh : public virtual LLAvatarJoint
-{
-protected:
-	LLColor4					mColor;			// color value
-// 	LLColor4					mSpecular;		// specular color (always white for now)
-	F32							mShiny;			// shiny value
-	LLPointer<LLGLTexture>		mTexture;		// ptr to a global texture
-	LLTexLayerSet*				mLayerSet;		// ptr to a layer set owned by the avatar
-	U32 						mTestImageName;		// handle to a temporary texture for previewing uploads
-	LLPolyMesh*					mMesh;			// ptr to a global polymesh
-	bool						mCullBackFaces;	// true by default
-	LLFace*						mFace;			// ptr to a face w/ AGP copy of mesh
-
-	U32							mFaceIndexCount;
-
-	U32							mNumSkinJoints;
-	LLSkinJoint*				mSkinJoints;
-	S32							mMeshID;
-
-public:
-	static bool					sPipelineRender;
-	//RN: this is here for testing purposes
-	static U32					sClothingMaskImageName;
-	static LLColor4				sClothingInnerColor;
-
-public:
-	// Constructor
-	LLAvatarJointMesh();
-
-	// Destructor
-	virtual ~LLAvatarJointMesh();
-
-	// Gets the shape color
-	void getColor( F32 *red, F32 *green, F32 *blue, F32 *alpha );
-
-	// Sets the shape color
-	void setColor( F32 red, F32 green, F32 blue, F32 alpha );
-	void setColor( const LLColor4& color );
-
-	// Sets the shininess
-	void setSpecular( const LLColor4& color, F32 shiny ) { /*mSpecular = color;*/ mShiny = shiny; };
-
-	// Sets the shape texture
-	void setTexture( LLGLTexture *texture );
-
-	bool hasGLTexture() const;
-
-	void setTestTexture( U32 name ) { mTestImageName = name; }
-
-	// Sets layer set responsible for a dynamic shape texture (takes precedence over normal texture)
-	void setLayerSet( LLTexLayerSet* layer_set );
-
-	bool hasComposite() const;
-
-	// Gets the poly mesh
-	LLPolyMesh *getMesh();
-
-	// Sets the poly mesh
-	void setMesh( LLPolyMesh *mesh );
-
-	// Sets up joint matrix data for rendering
-	void setupJoint(LLAvatarJoint* current_joint);
-
-	// Sets ID for picking
-	void setMeshID( S32 id ) {mMeshID = id;}
-
-	// Gets ID for picking
-	S32 getMeshID() { return mMeshID; }	
-
-	void setIsTransparent(bool is_transparent) { mIsTransparent = is_transparent; }
-
-private:
-	// Allocate skin data
-	bool allocateSkinData( U32 numSkinJoints );
-
-	// Free skin data
-	void freeSkinData();
-};
-
-#endif // LL_LLAVATARJOINTMESH_H
+/**

+ * @file llavatarjointmesh.h

+ * @brief Declaration of LLAvatarJointMesh 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_LLAVATARJOINTMESH_H

+#define LL_LLAVATARJOINTMESH_H

+

+#include "llavatarjoint.h"

+#include "llgltexture.h"

+#include "llpolymesh.h"

+#include "v4color.h"

+

+class LLDrawable;

+class LLFace;

+class LLCharacter;

+class LLTexLayerSet;

+

+typedef enum e_avatar_render_pass

+{

+    AVATAR_RENDER_PASS_SINGLE,

+    AVATAR_RENDER_PASS_CLOTHING_INNER,

+    AVATAR_RENDER_PASS_CLOTHING_OUTER

+} EAvatarRenderPass;

+

+class LLSkinJoint

+{

+public:

+    LLSkinJoint();

+    ~LLSkinJoint();

+    bool setupSkinJoint( LLAvatarJoint *joint);

+

+    LLAvatarJoint   *mJoint;

+    LLVector3       mRootToJointSkinOffset;

+    LLVector3       mRootToParentJointSkinOffset;

+};

+

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

+// class LLViewerJointMesh

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

+class LLAvatarJointMesh : public virtual LLAvatarJoint

+{

+protected:

+    LLColor4                    mColor;         // color value

+//  LLColor4                    mSpecular;      // specular color (always white for now)

+    F32                         mShiny;         // shiny value

+    LLPointer<LLGLTexture>      mTexture;       // ptr to a global texture

+    LLTexLayerSet*              mLayerSet;      // ptr to a layer set owned by the avatar

+    U32                         mTestImageName;     // handle to a temporary texture for previewing uploads

+    LLPolyMesh*                 mMesh;          // ptr to a global polymesh

+    bool                        mCullBackFaces; // true by default

+    LLFace*                     mFace;          // ptr to a face w/ AGP copy of mesh

+

+    U32                         mFaceIndexCount;

+

+    U32                         mNumSkinJoints;

+    LLSkinJoint*                mSkinJoints;

+    S32                         mMeshID;

+

+public:

+    static bool                 sPipelineRender;

+    //RN: this is here for testing purposes

+    static U32                  sClothingMaskImageName;

+    static LLColor4             sClothingInnerColor;

+

+public:

+    // Constructor

+    LLAvatarJointMesh();

+

+    // Destructor

+    virtual ~LLAvatarJointMesh();

+

+    // Gets the shape color

+    void getColor( F32 *red, F32 *green, F32 *blue, F32 *alpha );

+

+    // Sets the shape color

+    void setColor( F32 red, F32 green, F32 blue, F32 alpha );

+    void setColor( const LLColor4& color );

+

+    // Sets the shininess

+    void setSpecular( const LLColor4& color, F32 shiny ) { /*mSpecular = color;*/ mShiny = shiny; };

+

+    // Sets the shape texture

+    void setTexture( LLGLTexture *texture );

+

+    bool hasGLTexture() const;

+

+    void setTestTexture( U32 name ) { mTestImageName = name; }

+

+    // Sets layer set responsible for a dynamic shape texture (takes precedence over normal texture)

+    void setLayerSet( LLTexLayerSet* layer_set );

+

+    bool hasComposite() const;

+

+    // Gets the poly mesh

+    LLPolyMesh *getMesh();

+

+    // Sets the poly mesh

+    void setMesh( LLPolyMesh *mesh );

+

+    // Sets up joint matrix data for rendering

+    void setupJoint(LLAvatarJoint* current_joint);

+

+    // Sets ID for picking

+    void setMeshID( S32 id ) {mMeshID = id;}

+

+    // Gets ID for picking

+    S32 getMeshID() { return mMeshID; }

+

+    void setIsTransparent(bool is_transparent) { mIsTransparent = is_transparent; }

+

+private:

+    // Allocate skin data

+    bool allocateSkinData( U32 numSkinJoints );

+

+    // Free skin data

+    void freeSkinData();

+};

+

+#endif // LL_LLAVATARJOINTMESH_H