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

diff --git a/indra/newview/lltoolpipette.h b/indra/newview/lltoolpipette.h
index ade06ba78d..99cdd387b2 100644
--- a/indra/newview/lltoolpipette.h
+++ b/indra/newview/lltoolpipette.h
@@ -1,70 +1,70 @@
-/** 
- * @file lltoolpipette.h
- * @brief LLToolPipette class header file
- *
- * $LicenseInfo:firstyear=2006&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$
- */
-
-// A tool to pick texture entry infro from objects in world (color/texture)
-// This tool assumes it is transient in the codebase and must be used
-// accordingly. We should probably restructure the way tools are
-// managed so that this is handled automatically.
-
-#ifndef LL_LLTOOLPIPETTE_H
-#define LL_LLTOOLPIPETTE_H
-
-#include "lltool.h"
-#include "lltextureentry.h"
-#include <boost/function.hpp>
-#include <boost/signals2.hpp>
-
-class LLViewerObject;
-class LLPickInfo;
-
-class LLToolPipette
-:	public LLTool, public LLSingleton<LLToolPipette>
-{
-	LLSINGLETON(LLToolPipette);
-	virtual ~LLToolPipette();
-
-public:
-	virtual bool	handleMouseDown(S32 x, S32 y, MASK mask) override;
-	virtual bool	handleMouseUp(S32 x, S32 y, MASK mask) override;
-	virtual bool	handleHover(S32 x, S32 y, MASK mask) override;
-	virtual bool	handleToolTip(S32 x, S32 y, MASK mask) override;
-
-	// Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots
-	typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t;
-	void setToolSelectCallback(const signal_t::slot_type& cb) { mSignal.connect(cb); }
-	void setResult(bool success, const std::string& msg);
-	
-	void setTextureEntry(const LLTextureEntry* entry);
-	static void pickCallback(const LLPickInfo& pick_info);
-
-protected:
-	LLTextureEntry	mTextureEntry;
-	signal_t		mSignal;
-	bool			mSuccess;
-	std::string		mTooltipMsg;
-};
-
-#endif //LL_LLTOOLPIPETTE_H
+/**

+ * @file lltoolpipette.h

+ * @brief LLToolPipette class header file

+ *

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

+ */

+

+// A tool to pick texture entry infro from objects in world (color/texture)

+// This tool assumes it is transient in the codebase and must be used

+// accordingly. We should probably restructure the way tools are

+// managed so that this is handled automatically.

+

+#ifndef LL_LLTOOLPIPETTE_H

+#define LL_LLTOOLPIPETTE_H

+

+#include "lltool.h"

+#include "lltextureentry.h"

+#include <boost/function.hpp>

+#include <boost/signals2.hpp>

+

+class LLViewerObject;

+class LLPickInfo;

+

+class LLToolPipette

+:   public LLTool, public LLSingleton<LLToolPipette>

+{

+    LLSINGLETON(LLToolPipette);

+    virtual ~LLToolPipette();

+

+public:

+    virtual bool    handleMouseDown(S32 x, S32 y, MASK mask) override;

+    virtual bool    handleMouseUp(S32 x, S32 y, MASK mask) override;

+    virtual bool    handleHover(S32 x, S32 y, MASK mask) override;

+    virtual bool    handleToolTip(S32 x, S32 y, MASK mask) override;

+

+    // Note: Don't return connection; use boost::bind + boost::signals2::trackable to disconnect slots

+    typedef boost::signals2::signal<void (const LLTextureEntry& te)> signal_t;

+    void setToolSelectCallback(const signal_t::slot_type& cb) { mSignal.connect(cb); }

+    void setResult(bool success, const std::string& msg);

+

+    void setTextureEntry(const LLTextureEntry* entry);

+    static void pickCallback(const LLPickInfo& pick_info);

+

+protected:

+    LLTextureEntry  mTextureEntry;

+    signal_t        mSignal;

+    bool            mSuccess;

+    std::string     mTooltipMsg;

+};

+

+#endif //LL_LLTOOLPIPETTE_H