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

diff --git a/indra/newview/llsyswellitem.h b/indra/newview/llsyswellitem.h
index a735f6c389..ce9c8aa46d 100644
--- a/indra/newview/llsyswellitem.h
+++ b/indra/newview/llsyswellitem.h
@@ -1,81 +1,81 @@
-/** 
- * @file llsyswellitem.h
- * @brief                                    // TODO
- *
- * $LicenseInfo:firstyear=2003&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_LLSYSWELLITEM_H
-#define LL_LLSYSWELLITEM_H
-
-#include "llpanel.h"
-#include "lltextbox.h"
-#include "llbutton.h"
-#include "lliconctrl.h"
-
-#include <string>
-
-class LLSysWellItem : public LLPanel
-{
-public:
-	struct Params :	public LLInitParam::Block<Params, LLPanel::Params>
-	{
-		LLUUID        	notification_id;
-		std::string		title;
-        Params()        {};
-	};
-
-
-	LLSysWellItem(const Params& p);
-	virtual	~LLSysWellItem();
-
-	// title
-	void setTitle( std::string title );
-
-	// get item's ID
-	LLUUID getID() { return mID; }
-
-	// handlers
-	virtual bool handleMouseDown(S32 x, S32 y, MASK mask);
-	virtual void onMouseEnter(S32 x, S32 y, MASK mask);
-	virtual void onMouseLeave(S32 x, S32 y, MASK mask);
-
-	//callbacks
-	typedef boost::function<void (LLSysWellItem* item)> syswell_item_callback_t;
-	typedef boost::signals2::signal<void (LLSysWellItem* item)> syswell_item_signal_t;
-	syswell_item_signal_t mOnItemClose;	
-	syswell_item_signal_t mOnItemClick;	
-	boost::signals2::connection setOnItemCloseCallback(syswell_item_callback_t cb) { return mOnItemClose.connect(cb); }
-	boost::signals2::connection setOnItemClickCallback(syswell_item_callback_t cb) { return mOnItemClick.connect(cb); }
-
-private:
-
-	void onClickCloseBtn();
-
-	LLTextBox*	mTitle;
-	LLButton*	mCloseBtn;
-	LLUUID		mID;
-};
-
-#endif // LL_LLSYSWELLITEM_H
-
-
+/**

+ * @file llsyswellitem.h

+ * @brief                                    // TODO

+ *

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

+#define LL_LLSYSWELLITEM_H

+

+#include "llpanel.h"

+#include "lltextbox.h"

+#include "llbutton.h"

+#include "lliconctrl.h"

+

+#include <string>

+

+class LLSysWellItem : public LLPanel

+{

+public:

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

+    {

+        LLUUID          notification_id;

+        std::string     title;

+        Params()        {};

+    };

+

+

+    LLSysWellItem(const Params& p);

+    virtual ~LLSysWellItem();

+

+    // title

+    void setTitle( std::string title );

+

+    // get item's ID

+    LLUUID getID() { return mID; }

+

+    // handlers

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

+    virtual void onMouseEnter(S32 x, S32 y, MASK mask);

+    virtual void onMouseLeave(S32 x, S32 y, MASK mask);

+

+    //callbacks

+    typedef boost::function<void (LLSysWellItem* item)> syswell_item_callback_t;

+    typedef boost::signals2::signal<void (LLSysWellItem* item)> syswell_item_signal_t;

+    syswell_item_signal_t mOnItemClose;

+    syswell_item_signal_t mOnItemClick;

+    boost::signals2::connection setOnItemCloseCallback(syswell_item_callback_t cb) { return mOnItemClose.connect(cb); }

+    boost::signals2::connection setOnItemClickCallback(syswell_item_callback_t cb) { return mOnItemClick.connect(cb); }

+

+private:

+

+    void onClickCloseBtn();

+

+    LLTextBox*  mTitle;

+    LLButton*   mCloseBtn;

+    LLUUID      mID;

+};

+

+#endif // LL_LLSYSWELLITEM_H

+

+