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

diff --git a/indra/newview/lldndbutton.h b/indra/newview/lldndbutton.h
index 7cded48dc3..e486c105c4 100644
--- a/indra/newview/lldndbutton.h
+++ b/indra/newview/lldndbutton.h
@@ -1,80 +1,80 @@
-/**
- * @file lldndbutton.h
- * @brief Declaration of the drag-n-drop button.
- *
- * $LicenseInfo:firstyear=2009&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_LLDNDBUTTON_H
-#define LL_LLDNDBUTTON_H
-
-#include "llbutton.h"
-
-/**
- * Class representing a button which can handle Drag-And-Drop event.
- *
- * LLDragAndDropButton does not contain any logic to handle Drag-And-Drop itself.
- * Instead it provides drag_drop_handler_t which can be set to the button.
- * Then each Drag-And-Drop will be delegated to this handler without any pre/post processing.
- *
- * All xml parameters are the same as LLButton has.
- *
- * @see LLLandmarksPanel for example of usage of this class.
- */
-class LLDragAndDropButton : public LLButton
-{
-public:
-	struct Params : public LLInitParam::Block<Params, LLButton::Params> {};
-
-	LLDragAndDropButton(const Params& params);
-
-	typedef boost::function<bool (
-		S32 /*x*/, S32 /*y*/, MASK /*mask*/, bool /*drop*/,
-		EDragAndDropType /*cargo_type*/,
-		void* /*cargo_data*/,
-		EAcceptance* /*accept*/,
-		std::string& /*tooltip_msg*/)> drag_drop_handler_t;
-
-
-	/**
-	 * Sets a handler which should process Drag-And-Drop.
-	 */
-	void setDragAndDropHandler(drag_drop_handler_t handler) { mDragDropHandler = handler; }
-
-
-	/**
-	 * Process Drag-And-Drop by delegating the event to drag_drop_handler_t.
-	 * 
-	 * @return bool - value returned by drag_drop_handler_t if it is set, false otherwise.
-	 */
-	/*virtual*/ bool handleDragAndDrop(S32 x, S32 y, MASK mask, bool drop,
-		EDragAndDropType cargo_type,
-		void* cargo_data,
-		EAcceptance* accept,
-		std::string& tooltip_msg);
-
-private:
-	drag_drop_handler_t mDragDropHandler;
-};
-
-
-#endif // LL_LLDNDBUTTON_H
+/**

+ * @file lldndbutton.h

+ * @brief Declaration of the drag-n-drop button.

+ *

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

+#define LL_LLDNDBUTTON_H

+

+#include "llbutton.h"

+

+/**

+ * Class representing a button which can handle Drag-And-Drop event.

+ *

+ * LLDragAndDropButton does not contain any logic to handle Drag-And-Drop itself.

+ * Instead it provides drag_drop_handler_t which can be set to the button.

+ * Then each Drag-And-Drop will be delegated to this handler without any pre/post processing.

+ *

+ * All xml parameters are the same as LLButton has.

+ *

+ * @see LLLandmarksPanel for example of usage of this class.

+ */

+class LLDragAndDropButton : public LLButton

+{

+public:

+    struct Params : public LLInitParam::Block<Params, LLButton::Params> {};

+

+    LLDragAndDropButton(const Params& params);

+

+    typedef boost::function<bool (

+        S32 /*x*/, S32 /*y*/, MASK /*mask*/, bool /*drop*/,

+        EDragAndDropType /*cargo_type*/,

+        void* /*cargo_data*/,

+        EAcceptance* /*accept*/,

+        std::string& /*tooltip_msg*/)> drag_drop_handler_t;

+

+

+    /**

+     * Sets a handler which should process Drag-And-Drop.

+     */

+    void setDragAndDropHandler(drag_drop_handler_t handler) { mDragDropHandler = handler; }

+

+

+    /**

+     * Process Drag-And-Drop by delegating the event to drag_drop_handler_t.

+     *

+     * @return bool - value returned by drag_drop_handler_t if it is set, false otherwise.

+     */

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

+        EDragAndDropType cargo_type,

+        void* cargo_data,

+        EAcceptance* accept,

+        std::string& tooltip_msg);

+

+private:

+    drag_drop_handler_t mDragDropHandler;

+};

+

+

+#endif // LL_LLDNDBUTTON_H