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

diff --git a/indra/newview/llpanelwearing.h b/indra/newview/llpanelwearing.h
index a443b706b3..9c3f19c3de 100644
--- a/indra/newview/llpanelwearing.h
+++ b/indra/newview/llpanelwearing.h
@@ -1,113 +1,113 @@
-/**
- * @file llpanelwearing.h
- * @brief List of agent's worn items.
- *
- * $LicenseInfo:firstyear=2010&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_LLPANELWEARING_H
-#define LL_LLPANELWEARING_H
-
-#include "llpanel.h"
-
-// newview
-#include "llpanelappearancetab.h"
-#include "llselectmgr.h"
-#include "lltimer.h"
-
-class LLAccordionCtrl;
-class LLAccordionCtrlTab;
-class LLInventoryCategoriesObserver;
-class LLListContextMenu;
-class LLScrollListCtrl;
-class LLWearableItemsList;
-class LLWearingGearMenu;
-
-/**
- * @class LLPanelWearing
- *
- * A list of agents's currently worn items represented by
- * a flat list view.
- * Starts fetching necessary inventory content on first opening.
- */
-class LLPanelWearing : public LLPanelAppearanceTab
-{
-public:
-	LLPanelWearing();
-	virtual ~LLPanelWearing();
-
-	/*virtual*/ bool postBuild();
-
-	/*virtual*/ void draw();
-
-	/*virtual*/ void onOpen(const LLSD& info);
-
-	/*virtual*/ void onFilterSubStringChanged(const std::string& new_string, const std::string& old_string);
-
-	/*virtual*/ bool isActionEnabled(const LLSD& userdata);
-
-	/*virtual*/ void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const;
-
-	/*virtual*/ void copyToClipboard();
-
-	void startUpdateTimer();
-	void updateAttachmentsList();
-
-	boost::signals2::connection setSelectionChangeCallback(commit_callback_t cb);
-
-	bool hasItemSelected();
-
-	bool populateAttachmentsList(bool update = false);
-	void onAccordionTabStateChanged();
-	void setAttachmentDetails(LLSD content);
-	void requestAttachmentDetails();
-	void onRemoveItem();
-	void onEditAttachment();
-	void onRemoveAttachment();
-
-private:
-	void onWearableItemsListRightClick(LLUICtrl* ctrl, S32 x, S32 y);
-	void onTempAttachmentsListRightClick(LLUICtrl* ctrl, S32 x, S32 y);
-
-	void getAttachmentLimitsCoro(std::string url);
-
-	LLWearableItemsList* 			mCOFItemsList;
-	LLScrollListCtrl*				mTempItemsList;
-	LLWearingGearMenu*				mGearMenu;
-	LLListContextMenu*				mContextMenu;
-	LLListContextMenu*				mAttachmentsMenu;
-
-	LLAccordionCtrlTab* 			mWearablesTab;
-	LLAccordionCtrlTab* 			mAttachmentsTab;
-	LLAccordionCtrl*				mAccordionCtrl;
-
-	std::map<LLUUID, LLViewerObject*> mAttachmentsMap;
-
-	std::map<LLUUID, std::string> 	mObjectNames;
-
-	boost::signals2::connection 	mAttachmentsChangedConnection;
-	LLFrameTimer					mUpdateTimer;
-
-	bool							mIsInitialized;
-};
-
-#endif //LL_LLPANELWEARING_H
+/**

+ * @file llpanelwearing.h

+ * @brief List of agent's worn items.

+ *

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

+#define LL_LLPANELWEARING_H

+

+#include "llpanel.h"

+

+// newview

+#include "llpanelappearancetab.h"

+#include "llselectmgr.h"

+#include "lltimer.h"

+

+class LLAccordionCtrl;

+class LLAccordionCtrlTab;

+class LLInventoryCategoriesObserver;

+class LLListContextMenu;

+class LLScrollListCtrl;

+class LLWearableItemsList;

+class LLWearingGearMenu;

+

+/**

+ * @class LLPanelWearing

+ *

+ * A list of agents's currently worn items represented by

+ * a flat list view.

+ * Starts fetching necessary inventory content on first opening.

+ */

+class LLPanelWearing : public LLPanelAppearanceTab

+{

+public:

+    LLPanelWearing();

+    virtual ~LLPanelWearing();

+

+    /*virtual*/ bool postBuild();

+

+    /*virtual*/ void draw();

+

+    /*virtual*/ void onOpen(const LLSD& info);

+

+    /*virtual*/ void onFilterSubStringChanged(const std::string& new_string, const std::string& old_string);

+

+    /*virtual*/ bool isActionEnabled(const LLSD& userdata);

+

+    /*virtual*/ void getSelectedItemsUUIDs(uuid_vec_t& selected_uuids) const;

+

+    /*virtual*/ void copyToClipboard();

+

+    void startUpdateTimer();

+    void updateAttachmentsList();

+

+    boost::signals2::connection setSelectionChangeCallback(commit_callback_t cb);

+

+    bool hasItemSelected();

+

+    bool populateAttachmentsList(bool update = false);

+    void onAccordionTabStateChanged();

+    void setAttachmentDetails(LLSD content);

+    void requestAttachmentDetails();

+    void onRemoveItem();

+    void onEditAttachment();

+    void onRemoveAttachment();

+

+private:

+    void onWearableItemsListRightClick(LLUICtrl* ctrl, S32 x, S32 y);

+    void onTempAttachmentsListRightClick(LLUICtrl* ctrl, S32 x, S32 y);

+

+    void getAttachmentLimitsCoro(std::string url);

+

+    LLWearableItemsList*            mCOFItemsList;

+    LLScrollListCtrl*               mTempItemsList;

+    LLWearingGearMenu*              mGearMenu;

+    LLListContextMenu*              mContextMenu;

+    LLListContextMenu*              mAttachmentsMenu;

+

+    LLAccordionCtrlTab*             mWearablesTab;

+    LLAccordionCtrlTab*             mAttachmentsTab;

+    LLAccordionCtrl*                mAccordionCtrl;

+

+    std::map<LLUUID, LLViewerObject*> mAttachmentsMap;

+

+    std::map<LLUUID, std::string>   mObjectNames;

+

+    boost::signals2::connection     mAttachmentsChangedConnection;

+    LLFrameTimer                    mUpdateTimer;

+

+    bool                            mIsInitialized;

+};

+

+#endif //LL_LLPANELWEARING_H