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

diff --git a/indra/newview/llfloaterlinkreplace.h b/indra/newview/llfloaterlinkreplace.h
index 7096eedd4b..b056b71aab 100644
--- a/indra/newview/llfloaterlinkreplace.h
+++ b/indra/newview/llfloaterlinkreplace.h
@@ -1,123 +1,123 @@
-/**
- * @file llfloaterlinkreplace.h
- * @brief Allows replacing link targets in inventory links
- * @author Ansariel Hiller
- *
- * $LicenseInfo:firstyear=2017&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2017, 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_FLOATERLINKREPLACE_H
-#define LL_FLOATERLINKREPLACE_H
-
-#include "llfloater.h"
-#include "lleventtimer.h"
-#include "lllineeditor.h"
-#include "llinventoryfunctions.h"
-#include "llviewerinventory.h"
-
-class LLButton;
-class LLTextBox;
-
-class LLInventoryLinkReplaceDropTarget : public LLLineEditor
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLLineEditor::Params>
-	{
-		Params()
-		{}
-	};
-
-	LLInventoryLinkReplaceDropTarget(const Params& p)
-		: LLLineEditor(p) {}
-	~LLInventoryLinkReplaceDropTarget() {}
-
-	typedef boost::signals2::signal<void(const LLUUID& id)> item_dad_callback_t;
-	boost::signals2::connection setDADCallback(const item_dad_callback_t::slot_type& cb)
-	{
-		return mDADSignal.connect(cb);
-	}
-
-	virtual bool postBuild()
-	{
-		setEnabled(false);
-		return LLLineEditor::postBuild();
-	}
-
-	virtual bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
-								   EDragAndDropType cargo_type,
-								   void* cargo_data,
-								   EAcceptance* accept,
-								   std::string& tooltip_msg);
-
-	LLUUID getItemID() const { return mItemID; }
-	void setItem(LLInventoryItem* item);
-
-private:
-	LLUUID mItemID;
-
-	item_dad_callback_t mDADSignal;
-};
-
-
-class LLFloaterLinkReplace : public LLFloater, LLEventTimer
-{
-	LOG_CLASS(LLFloaterLinkReplace);
-
-public:
-	LLFloaterLinkReplace(const LLSD& key);
-	virtual ~LLFloaterLinkReplace();
-
-	bool postBuild();
-	virtual void onOpen(const LLSD& key);
-
-	virtual bool tick();
-
-private:
-	void checkEnableStart();
-	void onStartClicked();
-	void onStartClickedResponse(const LLSD& notification, const LLSD& response);
-	void decreaseOpenItemCount();
-	void updateFoundLinks();
-	void processBatch(LLInventoryModel::item_array_t items);
-
-	static void linkCreatedCallback(LLHandle<LLFloaterLinkReplace> floater_handle, const LLUUID& old_item_id, const LLUUID& target_item_id,
-	                                bool needs_wearable_ordering_update, bool needs_description_update, const LLUUID& outfit_folder_id);
-	static void itemRemovedCallback(LLHandle<LLFloaterLinkReplace> floater_handle, const LLUUID& outfit_folder_id);
-
-	void onSourceItemDrop(const LLUUID& source_item_id);
-	void onTargetItemDrop(const LLUUID& target_item_id);
-
-	LLInventoryLinkReplaceDropTarget*	mSourceEditor;
-	LLInventoryLinkReplaceDropTarget*	mTargetEditor;
-	LLButton*							mStartBtn;
-	LLButton*							mRefreshBtn;
-	LLTextBox*							mStatusText;
-
-	LLUUID	mSourceUUID;
-	LLUUID	mTargetUUID;
-	U32		mRemainingItems;
-	U32		mBatchSize;
-
-	LLInventoryModel::item_array_t	mRemainingInventoryItems;
-};
-
-#endif // LL_FLOATERLINKREPLACE_H
+/**

+ * @file llfloaterlinkreplace.h

+ * @brief Allows replacing link targets in inventory links

+ * @author Ansariel Hiller

+ *

+ * $LicenseInfo:firstyear=2017&license=viewerlgpl$

+ * Second Life Viewer Source Code

+ * Copyright (C) 2017, 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_FLOATERLINKREPLACE_H

+#define LL_FLOATERLINKREPLACE_H

+

+#include "llfloater.h"

+#include "lleventtimer.h"

+#include "lllineeditor.h"

+#include "llinventoryfunctions.h"

+#include "llviewerinventory.h"

+

+class LLButton;

+class LLTextBox;

+

+class LLInventoryLinkReplaceDropTarget : public LLLineEditor

+{

+public:

+    struct Params : public LLInitParam::Block<Params, LLLineEditor::Params>

+    {

+        Params()

+        {}

+    };

+

+    LLInventoryLinkReplaceDropTarget(const Params& p)

+        : LLLineEditor(p) {}

+    ~LLInventoryLinkReplaceDropTarget() {}

+

+    typedef boost::signals2::signal<void(const LLUUID& id)> item_dad_callback_t;

+    boost::signals2::connection setDADCallback(const item_dad_callback_t::slot_type& cb)

+    {

+        return mDADSignal.connect(cb);

+    }

+

+    virtual bool postBuild()

+    {

+        setEnabled(false);

+        return LLLineEditor::postBuild();

+    }

+

+    virtual bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,

+                                   EDragAndDropType cargo_type,

+                                   void* cargo_data,

+                                   EAcceptance* accept,

+                                   std::string& tooltip_msg);

+

+    LLUUID getItemID() const { return mItemID; }

+    void setItem(LLInventoryItem* item);

+

+private:

+    LLUUID mItemID;

+

+    item_dad_callback_t mDADSignal;

+};

+

+

+class LLFloaterLinkReplace : public LLFloater, LLEventTimer

+{

+    LOG_CLASS(LLFloaterLinkReplace);

+

+public:

+    LLFloaterLinkReplace(const LLSD& key);

+    virtual ~LLFloaterLinkReplace();

+

+    bool postBuild();

+    virtual void onOpen(const LLSD& key);

+

+    virtual bool tick();

+

+private:

+    void checkEnableStart();

+    void onStartClicked();

+    void onStartClickedResponse(const LLSD& notification, const LLSD& response);

+    void decreaseOpenItemCount();

+    void updateFoundLinks();

+    void processBatch(LLInventoryModel::item_array_t items);

+

+    static void linkCreatedCallback(LLHandle<LLFloaterLinkReplace> floater_handle, const LLUUID& old_item_id, const LLUUID& target_item_id,

+                                    bool needs_wearable_ordering_update, bool needs_description_update, const LLUUID& outfit_folder_id);

+    static void itemRemovedCallback(LLHandle<LLFloaterLinkReplace> floater_handle, const LLUUID& outfit_folder_id);

+

+    void onSourceItemDrop(const LLUUID& source_item_id);

+    void onTargetItemDrop(const LLUUID& target_item_id);

+

+    LLInventoryLinkReplaceDropTarget*   mSourceEditor;

+    LLInventoryLinkReplaceDropTarget*   mTargetEditor;

+    LLButton*                           mStartBtn;

+    LLButton*                           mRefreshBtn;

+    LLTextBox*                          mStatusText;

+

+    LLUUID  mSourceUUID;

+    LLUUID  mTargetUUID;

+    U32     mRemainingItems;

+    U32     mBatchSize;

+

+    LLInventoryModel::item_array_t  mRemainingInventoryItems;

+};

+

+#endif // LL_FLOATERLINKREPLACE_H