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

diff --git a/indra/newview/llviewerjointattachment.h b/indra/newview/llviewerjointattachment.h
index 980ac3a7ca..ee86adcb24 100644
--- a/indra/newview/llviewerjointattachment.h
+++ b/indra/newview/llviewerjointattachment.h
@@ -1,111 +1,111 @@
-/** 
- * @file llviewerjointattachment.h
- * @brief Implementation of LLViewerJointAttachment class
- *
- * $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_LLVIEWERJOINTATTACHMENT_H
-#define LL_LLVIEWERJOINTATTACHMENT_H
-
-//-----------------------------------------------------------------------------
-// Header Files
-//-----------------------------------------------------------------------------
-#include "llviewerjoint.h"
-#include "llstring.h"
-#include "lluuid.h"
-
-class LLDrawable;
-class LLViewerObject;
-
-//-----------------------------------------------------------------------------
-// class LLViewerJointAttachment
-//-----------------------------------------------------------------------------
-class LLViewerJointAttachment :
-	public LLViewerJoint
-{
-public:
-	LLViewerJointAttachment();
-	virtual ~LLViewerJointAttachment();
-
-	// Returns true if this object is transparent.
-	// This is used to determine in which order to draw objects.
-	bool isTransparent() override;
-
-	// Draws the shape attached to a joint.
-	// Called by render().
-	U32 drawShape( F32 pixelArea, bool first_pass, bool is_dummy ) override;
-	
-	bool updateLOD(F32 pixel_area, bool activate) override;
-
-	//
-	// accessors
-	//
-
-	void setPieSlice(S32 pie_slice) { mPieSlice = pie_slice; }	
-	void setVisibleInFirstPerson(bool visibility) { mVisibleInFirst = visibility; }
-	bool getVisibleInFirstPerson() const { return mVisibleInFirst; }
-	void setGroup(S32 group) { mGroup = group; }
-	void setOriginalPosition(LLVector3 &position);
-	void setAttachmentVisibility(bool visible);
-	void setIsHUDAttachment(bool is_hud) { mIsHUDAttachment = is_hud; }
-	bool getIsHUDAttachment() const { return mIsHUDAttachment; }
-
-	bool isAnimatable() const override { return false; }
-
-	S32 getGroup() const { return mGroup; }
-	S32 getPieSlice() const { return mPieSlice; }
-	S32	getNumObjects() const { return mAttachedObjects.size(); }
-	S32	getNumAnimatedObjects() const;
-
-	void clampObjectPosition();
-
-	//
-	// unique methods
-	//
-	bool addObject(LLViewerObject* object);
-	void removeObject(LLViewerObject *object);
-
-	// 
-	// attachments operations
-	//
-	bool isObjectAttached(const LLViewerObject *viewer_object) const;
-	const LLViewerObject *getAttachedObject(const LLUUID &object_id) const;
-	LLViewerObject *getAttachedObject(const LLUUID &object_id);
-
-	// list of attachments for this joint
-	typedef std::vector<LLPointer<LLViewerObject> > attachedobjs_vec_t;
-	attachedobjs_vec_t mAttachedObjects;
-
-protected:
-	void calcLOD();
-	void setupDrawable(LLViewerObject *object);
-
-private:
-	bool			mVisibleInFirst;
-	LLVector3		mOriginalPos;
-	S32				mGroup;
-	bool			mIsHUDAttachment;
-	S32				mPieSlice;
-};
-
-#endif // LL_LLVIEWERJOINTATTACHMENT_H
+/**

+ * @file llviewerjointattachment.h

+ * @brief Implementation of LLViewerJointAttachment class

+ *

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

+#define LL_LLVIEWERJOINTATTACHMENT_H

+

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

+// Header Files

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

+#include "llviewerjoint.h"

+#include "llstring.h"

+#include "lluuid.h"

+

+class LLDrawable;

+class LLViewerObject;

+

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

+// class LLViewerJointAttachment

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

+class LLViewerJointAttachment :

+    public LLViewerJoint

+{

+public:

+    LLViewerJointAttachment();

+    virtual ~LLViewerJointAttachment();

+

+    // Returns true if this object is transparent.

+    // This is used to determine in which order to draw objects.

+    bool isTransparent() override;

+

+    // Draws the shape attached to a joint.

+    // Called by render().

+    U32 drawShape( F32 pixelArea, bool first_pass, bool is_dummy ) override;

+

+    bool updateLOD(F32 pixel_area, bool activate) override;

+

+    //

+    // accessors

+    //

+

+    void setPieSlice(S32 pie_slice) { mPieSlice = pie_slice; }

+    void setVisibleInFirstPerson(bool visibility) { mVisibleInFirst = visibility; }

+    bool getVisibleInFirstPerson() const { return mVisibleInFirst; }

+    void setGroup(S32 group) { mGroup = group; }

+    void setOriginalPosition(LLVector3 &position);

+    void setAttachmentVisibility(bool visible);

+    void setIsHUDAttachment(bool is_hud) { mIsHUDAttachment = is_hud; }

+    bool getIsHUDAttachment() const { return mIsHUDAttachment; }

+

+    bool isAnimatable() const override { return false; }

+

+    S32 getGroup() const { return mGroup; }

+    S32 getPieSlice() const { return mPieSlice; }

+    S32 getNumObjects() const { return mAttachedObjects.size(); }

+    S32 getNumAnimatedObjects() const;

+

+    void clampObjectPosition();

+

+    //

+    // unique methods

+    //

+    bool addObject(LLViewerObject* object);

+    void removeObject(LLViewerObject *object);

+

+    //

+    // attachments operations

+    //

+    bool isObjectAttached(const LLViewerObject *viewer_object) const;

+    const LLViewerObject *getAttachedObject(const LLUUID &object_id) const;

+    LLViewerObject *getAttachedObject(const LLUUID &object_id);

+

+    // list of attachments for this joint

+    typedef std::vector<LLPointer<LLViewerObject> > attachedobjs_vec_t;

+    attachedobjs_vec_t mAttachedObjects;

+

+protected:

+    void calcLOD();

+    void setupDrawable(LLViewerObject *object);

+

+private:

+    bool            mVisibleInFirst;

+    LLVector3       mOriginalPos;

+    S32             mGroup;

+    bool            mIsHUDAttachment;

+    S32             mPieSlice;

+};

+

+#endif // LL_LLVIEWERJOINTATTACHMENT_H