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

diff --git a/indra/newview/llsyswellwindow.h b/indra/newview/llsyswellwindow.h
index 12c1de7626..b40f1a5414 100644
--- a/indra/newview/llsyswellwindow.h
+++ b/indra/newview/llsyswellwindow.h
@@ -1,153 +1,153 @@
-/** 
- * @file llsyswellwindow.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_LLSYSWELLWINDOW_H
-#define LL_LLSYSWELLWINDOW_H
-
-#include "llimview.h"
-#include "llnotifications.h"
-#include "llscreenchannel.h"
-#include "llsyswellitem.h"
-#include "lltransientdockablefloater.h"
-#include "llinitdestroyclass.h"
-
-class LLAvatarName;
-class LLChiclet;
-class LLFlatListView;
-class LLIMChiclet;
-class LLScriptChiclet;
-class LLSysWellChiclet;
-
-class LLSysWellWindow : public LLTransientDockableFloater
-{
-public:
-	LOG_CLASS(LLSysWellWindow);
-
-    LLSysWellWindow(const LLSD& key);
-    virtual ~LLSysWellWindow();
-	bool postBuild();
-
-	// other interface functions
-	// check is window empty
-	bool isWindowEmpty();
-
-	// Operating with items
-	void removeItemByID(const LLUUID& id);
-	LLPanel * findItemByID(const LLUUID& id);
-
-	// Operating with outfit
-	virtual void setVisible(bool visible);
-	void adjustWindowPosition();
-	/*virtual*/ void	setDocked(bool docked, bool pop_on_undock = true);
-	// override LLFloater's minimization according to EXT-1216
-	/*virtual*/ void	setMinimized(bool minimize);
-	/*virtual*/ void	handleReshape(const LLRect& rect, bool by_user);
-
-	void onStartUpToastClick(S32 x, S32 y, MASK mask);
-
-	void setSysWellChiclet(LLSysWellChiclet* chiclet);
-
-	// size constants for the window and for its elements
-	static constexpr S32 MAX_WINDOW_HEIGHT		= 200;
-	static constexpr S32 MIN_WINDOW_WIDTH		= 318;
-
-protected:
-	// init Window's channel
-	virtual void initChannel();
-
-	const std::string NOTIFICATION_WELL_ANCHOR_NAME;
-	const std::string IM_WELL_ANCHOR_NAME;
-	virtual const std::string& getAnchorViewName() = 0;
-
-	void reshapeWindow();
-
-	// pointer to a corresponding channel's instance
-	LLNotificationsUI::LLScreenChannel*	mChannel;
-	LLFlatListView*	mMessageList;
-
-	/**
-	 * Reference to an appropriate Well chiclet to release "new message" state. EXT-3147
-	 */
-	LLSysWellChiclet* mSysWellChiclet;
-
-	bool mIsReshapedByUser;
-};
-
-/**
- * Class intended to manage incoming messages in IM chats.
- * 
- * It contains a list list of all active IM sessions.
- */
-class LLIMWellWindow : public LLSysWellWindow, LLInitClass<LLIMWellWindow>
-{
-public:
-	LLIMWellWindow(const LLSD& key);
-	~LLIMWellWindow();
-
-	static LLIMWellWindow* getInstance(const LLSD& key = LLSD());
-	static LLIMWellWindow* findInstance(const LLSD& key = LLSD());
-	static void initClass() { getInstance(); }
-
-	/*virtual*/ bool postBuild();
-
-	void addObjectRow(const LLUUID& notification_id, bool new_message = false);
-	void removeObjectRow(const LLUUID& notification_id);
-	void closeAll();
-
-protected:
-	/*virtual*/ const std::string& getAnchorViewName() { return IM_WELL_ANCHOR_NAME; }
-
-private:
-	LLChiclet* findObjectChiclet(const LLUUID& notification_id);
-
-	bool confirmCloseAll(const LLSD& notification, const LLSD& response);
-	void closeAllImpl();
-
-	class ObjectRowPanel: public LLPanel
-	{
-	public:
-		ObjectRowPanel(const LLUUID& notification_id, bool new_message = false);
-		virtual ~ObjectRowPanel();
-		/*virtual*/ void onMouseEnter(S32 x, S32 y, MASK mask);
-		/*virtual*/ void onMouseLeave(S32 x, S32 y, MASK mask);
-		/*virtual*/ bool handleMouseDown(S32 x, S32 y, MASK mask);
-		/*virtual*/ bool handleRightMouseDown(S32 x, S32 y, MASK mask);
-
-	private:
-		void onClosePanel();
-		void initChiclet(const LLUUID& notification_id, bool new_message = false);
-
-	public:
-		LLIMChiclet* mChiclet;
-	private:
-		LLButton*	mCloseBtn;
-	};
-};
-
-#endif // LL_LLSYSWELLWINDOW_H
-
-
-
+/**

+ * @file llsyswellwindow.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_LLSYSWELLWINDOW_H

+#define LL_LLSYSWELLWINDOW_H

+

+#include "llimview.h"

+#include "llnotifications.h"

+#include "llscreenchannel.h"

+#include "llsyswellitem.h"

+#include "lltransientdockablefloater.h"

+#include "llinitdestroyclass.h"

+

+class LLAvatarName;

+class LLChiclet;

+class LLFlatListView;

+class LLIMChiclet;

+class LLScriptChiclet;

+class LLSysWellChiclet;

+

+class LLSysWellWindow : public LLTransientDockableFloater

+{

+public:

+    LOG_CLASS(LLSysWellWindow);

+

+    LLSysWellWindow(const LLSD& key);

+    virtual ~LLSysWellWindow();

+    bool postBuild();

+

+    // other interface functions

+    // check is window empty

+    bool isWindowEmpty();

+

+    // Operating with items

+    void removeItemByID(const LLUUID& id);

+    LLPanel * findItemByID(const LLUUID& id);

+

+    // Operating with outfit

+    virtual void setVisible(bool visible);

+    void adjustWindowPosition();

+    /*virtual*/ void    setDocked(bool docked, bool pop_on_undock = true);

+    // override LLFloater's minimization according to EXT-1216

+    /*virtual*/ void    setMinimized(bool minimize);

+    /*virtual*/ void    handleReshape(const LLRect& rect, bool by_user);

+

+    void onStartUpToastClick(S32 x, S32 y, MASK mask);

+

+    void setSysWellChiclet(LLSysWellChiclet* chiclet);

+

+    // size constants for the window and for its elements

+    static constexpr S32 MAX_WINDOW_HEIGHT      = 200;

+    static constexpr S32 MIN_WINDOW_WIDTH       = 318;

+

+protected:

+    // init Window's channel

+    virtual void initChannel();

+

+    const std::string NOTIFICATION_WELL_ANCHOR_NAME;

+    const std::string IM_WELL_ANCHOR_NAME;

+    virtual const std::string& getAnchorViewName() = 0;

+

+    void reshapeWindow();

+

+    // pointer to a corresponding channel's instance

+    LLNotificationsUI::LLScreenChannel* mChannel;

+    LLFlatListView* mMessageList;

+

+    /**

+     * Reference to an appropriate Well chiclet to release "new message" state. EXT-3147

+     */

+    LLSysWellChiclet* mSysWellChiclet;

+

+    bool mIsReshapedByUser;

+};

+

+/**

+ * Class intended to manage incoming messages in IM chats.

+ *

+ * It contains a list list of all active IM sessions.

+ */

+class LLIMWellWindow : public LLSysWellWindow, LLInitClass<LLIMWellWindow>

+{

+public:

+    LLIMWellWindow(const LLSD& key);

+    ~LLIMWellWindow();

+

+    static LLIMWellWindow* getInstance(const LLSD& key = LLSD());

+    static LLIMWellWindow* findInstance(const LLSD& key = LLSD());

+    static void initClass() { getInstance(); }

+

+    /*virtual*/ bool postBuild();

+

+    void addObjectRow(const LLUUID& notification_id, bool new_message = false);

+    void removeObjectRow(const LLUUID& notification_id);

+    void closeAll();

+

+protected:

+    /*virtual*/ const std::string& getAnchorViewName() { return IM_WELL_ANCHOR_NAME; }

+

+private:

+    LLChiclet* findObjectChiclet(const LLUUID& notification_id);

+

+    bool confirmCloseAll(const LLSD& notification, const LLSD& response);

+    void closeAllImpl();

+

+    class ObjectRowPanel: public LLPanel

+    {

+    public:

+        ObjectRowPanel(const LLUUID& notification_id, bool new_message = false);

+        virtual ~ObjectRowPanel();

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

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

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

+        /*virtual*/ bool handleRightMouseDown(S32 x, S32 y, MASK mask);

+

+    private:

+        void onClosePanel();

+        void initChiclet(const LLUUID& notification_id, bool new_message = false);

+

+    public:

+        LLIMChiclet* mChiclet;

+    private:

+        LLButton*   mCloseBtn;

+    };

+};

+

+#endif // LL_LLSYSWELLWINDOW_H

+

+

+