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

diff --git a/indra/llappearance/llwearabledata.h b/indra/llappearance/llwearabledata.h
index 2fe9ae2302..1396dda52c 100644
--- a/indra/llappearance/llwearabledata.h
+++ b/indra/llappearance/llwearabledata.h
@@ -1,102 +1,102 @@
-/** 
- * @file llwearabledata.h
- * @brief LLWearableData class header file
- *
- * $LicenseInfo:firstyear=2012&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_WEARABLEDATA_H
-#define LL_WEARABLEDATA_H
-
-#include "llavatarappearancedefines.h"
-#include "llwearable.h"
-#include "llerror.h"
-
-class LLAvatarAppearance;
-
-class LLWearableData
-{
-	// *TODO: Figure out why this is causing compile error.
-	//LOG_CLASS(LLWearableData);
-
-	//--------------------------------------------------------------------
-	// Constructors / destructors / Initializers
-	//--------------------------------------------------------------------
-public:
-	LLWearableData();
-	virtual ~LLWearableData();
-
-	void setAvatarAppearance(LLAvatarAppearance* appearance) { mAvatarAppearance = appearance; }
-
-protected:
-	//--------------------------------------------------------------------
-	// Accessors
-	//--------------------------------------------------------------------
-public:
-	LLWearable*			getWearable(const LLWearableType::EType type, U32 index /*= 0*/); 
-	const LLWearable* 	getWearable(const LLWearableType::EType type, U32 index /*= 0*/) const;
-	LLWearable*			getTopWearable(const LLWearableType::EType type);
-	const LLWearable*	getTopWearable(const LLWearableType::EType type) const;
-	LLWearable*			getBottomWearable(const LLWearableType::EType type);
-	const LLWearable*	getBottomWearable(const LLWearableType::EType type) const;
-	U32				getWearableCount(const LLWearableType::EType type) const;
-	U32				getWearableCount(const U32 tex_index) const;
-	bool			getWearableIndex(const LLWearable *wearable, U32& index) const;
-	U32				getClothingLayerCount() const;
-	bool			canAddWearable(const LLWearableType::EType type) const;
-
-	bool			isOnTop(LLWearable* wearable) const;
-	
-	static const U32 MAX_CLOTHING_LAYERS = 60;
-
-	//--------------------------------------------------------------------
-	// Setters
-	//--------------------------------------------------------------------
-protected:
-	// Low-level data structure setter - public access is via setWearableItem, etc.
-	void 			setWearable(const LLWearableType::EType type, U32 index, LLWearable *wearable);
-	void 			pushWearable(const LLWearableType::EType type, LLWearable *wearable, 
-								 bool trigger_updated = true);
-	virtual void	wearableUpdated(LLWearable *wearable, bool removed);
-	void 			eraseWearable(LLWearable *wearable);
-	void			eraseWearable(const LLWearableType::EType type, U32 index);
-	void			clearWearableType(const LLWearableType::EType type);
-	bool			swapWearables(const LLWearableType::EType type, U32 index_a, U32 index_b);
-
-private:
-	void			pullCrossWearableValues(const LLWearableType::EType type);
-
-	//--------------------------------------------------------------------
-	// Member variables
-	//--------------------------------------------------------------------
-protected:
-	LLAvatarAppearance* mAvatarAppearance;
-	typedef std::vector<LLWearable*> wearableentry_vec_t; // all wearables of a certain type (EG all shirts)
-	typedef std::map<LLWearableType::EType, wearableentry_vec_t> wearableentry_map_t;	// wearable "categories" arranged by wearable type
-	wearableentry_map_t mWearableDatas;
-
-};
-
-
-
-#endif // LL_WEARABLEDATA_H
-
+/**

+ * @file llwearabledata.h

+ * @brief LLWearableData class header file

+ *

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

+#define LL_WEARABLEDATA_H

+

+#include "llavatarappearancedefines.h"

+#include "llwearable.h"

+#include "llerror.h"

+

+class LLAvatarAppearance;

+

+class LLWearableData

+{

+    // *TODO: Figure out why this is causing compile error.

+    //LOG_CLASS(LLWearableData);

+

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

+    // Constructors / destructors / Initializers

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

+public:

+    LLWearableData();

+    virtual ~LLWearableData();

+

+    void setAvatarAppearance(LLAvatarAppearance* appearance) { mAvatarAppearance = appearance; }

+

+protected:

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

+    // Accessors

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

+public:

+    LLWearable*         getWearable(const LLWearableType::EType type, U32 index /*= 0*/);

+    const LLWearable*   getWearable(const LLWearableType::EType type, U32 index /*= 0*/) const;

+    LLWearable*         getTopWearable(const LLWearableType::EType type);

+    const LLWearable*   getTopWearable(const LLWearableType::EType type) const;

+    LLWearable*         getBottomWearable(const LLWearableType::EType type);

+    const LLWearable*   getBottomWearable(const LLWearableType::EType type) const;

+    U32             getWearableCount(const LLWearableType::EType type) const;

+    U32             getWearableCount(const U32 tex_index) const;

+    bool            getWearableIndex(const LLWearable *wearable, U32& index) const;

+    U32             getClothingLayerCount() const;

+    bool            canAddWearable(const LLWearableType::EType type) const;

+

+    bool            isOnTop(LLWearable* wearable) const;

+

+    static const U32 MAX_CLOTHING_LAYERS = 60;

+

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

+    // Setters

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

+protected:

+    // Low-level data structure setter - public access is via setWearableItem, etc.

+    void            setWearable(const LLWearableType::EType type, U32 index, LLWearable *wearable);

+    void            pushWearable(const LLWearableType::EType type, LLWearable *wearable,

+                                 bool trigger_updated = true);

+    virtual void    wearableUpdated(LLWearable *wearable, bool removed);

+    void            eraseWearable(LLWearable *wearable);

+    void            eraseWearable(const LLWearableType::EType type, U32 index);

+    void            clearWearableType(const LLWearableType::EType type);

+    bool            swapWearables(const LLWearableType::EType type, U32 index_a, U32 index_b);

+

+private:

+    void            pullCrossWearableValues(const LLWearableType::EType type);

+

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

+    // Member variables

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

+protected:

+    LLAvatarAppearance* mAvatarAppearance;

+    typedef std::vector<LLWearable*> wearableentry_vec_t; // all wearables of a certain type (EG all shirts)

+    typedef std::map<LLWearableType::EType, wearableentry_vec_t> wearableentry_map_t;   // wearable "categories" arranged by wearable type

+    wearableentry_map_t mWearableDatas;

+

+};

+

+

+

+#endif // LL_WEARABLEDATA_H

+