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

diff --git a/indra/newview/llfloaternotificationstabbed.h b/indra/newview/llfloaternotificationstabbed.h
index a8ff3d8002..2f6a6bd5dc 100644
--- a/indra/newview/llfloaternotificationstabbed.h
+++ b/indra/newview/llfloaternotificationstabbed.h
@@ -1,174 +1,174 @@
-/** 
- * @file llfloaternotificationstabbed.h
- * @brief                                  
- *
- * $LicenseInfo:firstyear=2015&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2015, 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_FLOATERNOTIFICATIONSTABBED_H
-#define LL_FLOATERNOTIFICATIONSTABBED_H
-
-#include "llimview.h"
-#include "llnotifications.h"
-#include "llscreenchannel.h"
-#include "llsyswellitem.h"
-#include "lltransientdockablefloater.h"
-#include "llnotificationlistview.h"
-#include "lltabcontainer.h"
-
-class LLAvatarName;
-class LLChiclet;
-class LLFlatListView;
-class LLIMChiclet;
-class LLScriptChiclet;
-class LLSysWellChiclet;
-
-class LLNotificationSeparator
-{
-public:
-    LLNotificationSeparator();
-    ~LLNotificationSeparator();
-    void initTaggedList(const std::string& tag, LLNotificationListView* list);
-    void initTaggedList(const std::set<std::string>& tags, LLNotificationListView* list);
-    void initUnTaggedList(LLNotificationListView* list);
-    bool addItem(std::string& tag, LLNotificationListItem* item);
-    LLPanel* findItemByID(std::string& tag, const LLUUID& id);
-    bool removeItemByID(std::string& tag, const LLUUID& id);
-    void getItems(std::vector<LLNotificationListItem*>& items) const;
-    U32 size() const;
-private:
-    static void getItemsFromList(std::vector<LLNotificationListItem*>& items, LLNotificationListView* list);
-
-    typedef std::map<std::string, LLNotificationListView*> notification_list_map_t;
-    notification_list_map_t mNotificationListMap;
-    typedef std::list<LLNotificationListView*> notification_list_list_t;
-    notification_list_list_t mNotificationLists;
-    LLNotificationListView* mUnTaggedList;
-};
-
-class LLFloaterNotificationsTabbed : public LLTransientDockableFloater
-{
-public:
-    LOG_CLASS(LLFloaterNotificationsTabbed);
-
-    LLFloaterNotificationsTabbed(const LLSD& key);
-    virtual ~LLFloaterNotificationsTabbed();
-    bool postBuild();
-
-    // other interface functions
-    // check is window empty
-    bool isWindowEmpty();
-
-    // Operating with items
-    void removeItemByID(const LLUUID& id, std::string type);
-    LLPanel * findItemByID(const LLUUID& id, std::string type);
-    void updateNotificationCounters();
-    void updateNotificationCounter(S32 panelIndex, S32 counterValue, std::string stringName);
-
-    // Operating with outfit
-    virtual void setVisible(bool visible);
-
-    /*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);
-    /*virtual*/ void onAdd(LLNotificationPtr notify);
-
-    void setSysWellChiclet(LLSysWellChiclet* chiclet);
-    void closeAll();
-
-    static LLFloaterNotificationsTabbed* getInstance(const LLSD& key = LLSD());
-
-    // size constants for the window and for its elements
-    static constexpr S32 MAX_WINDOW_HEIGHT      = 200;
-    static constexpr S32 MIN_WINDOW_WIDTH       = 318;
-
-private:
-    // init Window's channel
-    virtual void initChannel();
-
-    const std::string NOTIFICATION_TABBED_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;
-
-    /**
-     * Reference to an appropriate Well chiclet to release "new message" state. EXT-3147
-     */
-    LLSysWellChiclet* mSysWellChiclet;
-
-    bool mIsReshapedByUser;
-
-    struct NotificationTabbedChannel : public LLNotificationChannel
-    {
-        NotificationTabbedChannel(LLFloaterNotificationsTabbed*);
-        void onDelete(LLNotificationPtr notify)
-        {
-            mNotificationsTabbedWindow->removeItemByID(notify->getID(), notify->getName());
-        } 
-
-        LLFloaterNotificationsTabbed* mNotificationsTabbedWindow;
-    };
-
-    LLNotificationChannelPtr mNotificationUpdates;
-    virtual const std::string& getAnchorViewName() { return NOTIFICATION_TABBED_ANCHOR_NAME; }
-
-    // init Window's channel
-    // void initChannel();
-    void clearScreenChannels();
-    // Operating with items
-    void addItem(LLNotificationListItem::Params p);
-    void getAllItemsOnCurrentTab(std::vector<LLPanel*>& items) const;
-
-    // Closes all notifications and removes them from the Notification Well
-    void closeAllOnCurrentTab();
-    void collapseAllOnCurrentTab();
-
-    void onStoreToast(LLPanel* info_panel, LLUUID id);
-    void onClickDeleteAllBtn();
-    void onClickCollapseAllBtn();
-    // Handlers
-    void onItemClick(LLNotificationListItem* item);
-    void onItemClose(LLNotificationListItem* item);
-    // ID of a toast loaded by user (by clicking notification well item)
-    LLUUID mLoadedToastId;
-
-    LLNotificationListView*	mGroupInviteMessageList;
-    LLNotificationListView*	mGroupNoticeMessageList;
-    LLNotificationListView*	mTransactionMessageList;
-    LLNotificationListView*	mSystemMessageList;
-    LLNotificationSeparator* mNotificationsSeparator;
-    LLTabContainer* mNotificationsTabContainer;
-    LLButton*	mDeleteAllBtn;
-    LLButton*	mCollapseAllBtn;
-};
-
-#endif // LL_FLOATERNOTIFICATIONSTABBED_H
-
-
-
+/**

+ * @file llfloaternotificationstabbed.h

+ * @brief

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2015, 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_FLOATERNOTIFICATIONSTABBED_H

+#define LL_FLOATERNOTIFICATIONSTABBED_H

+

+#include "llimview.h"

+#include "llnotifications.h"

+#include "llscreenchannel.h"

+#include "llsyswellitem.h"

+#include "lltransientdockablefloater.h"

+#include "llnotificationlistview.h"

+#include "lltabcontainer.h"

+

+class LLAvatarName;

+class LLChiclet;

+class LLFlatListView;

+class LLIMChiclet;

+class LLScriptChiclet;

+class LLSysWellChiclet;

+

+class LLNotificationSeparator

+{

+public:

+    LLNotificationSeparator();

+    ~LLNotificationSeparator();

+    void initTaggedList(const std::string& tag, LLNotificationListView* list);

+    void initTaggedList(const std::set<std::string>& tags, LLNotificationListView* list);

+    void initUnTaggedList(LLNotificationListView* list);

+    bool addItem(std::string& tag, LLNotificationListItem* item);

+    LLPanel* findItemByID(std::string& tag, const LLUUID& id);

+    bool removeItemByID(std::string& tag, const LLUUID& id);

+    void getItems(std::vector<LLNotificationListItem*>& items) const;

+    U32 size() const;

+private:

+    static void getItemsFromList(std::vector<LLNotificationListItem*>& items, LLNotificationListView* list);

+

+    typedef std::map<std::string, LLNotificationListView*> notification_list_map_t;

+    notification_list_map_t mNotificationListMap;

+    typedef std::list<LLNotificationListView*> notification_list_list_t;

+    notification_list_list_t mNotificationLists;

+    LLNotificationListView* mUnTaggedList;

+};

+

+class LLFloaterNotificationsTabbed : public LLTransientDockableFloater

+{

+public:

+    LOG_CLASS(LLFloaterNotificationsTabbed);

+

+    LLFloaterNotificationsTabbed(const LLSD& key);

+    virtual ~LLFloaterNotificationsTabbed();

+    bool postBuild();

+

+    // other interface functions

+    // check is window empty

+    bool isWindowEmpty();

+

+    // Operating with items

+    void removeItemByID(const LLUUID& id, std::string type);

+    LLPanel * findItemByID(const LLUUID& id, std::string type);

+    void updateNotificationCounters();

+    void updateNotificationCounter(S32 panelIndex, S32 counterValue, std::string stringName);

+

+    // Operating with outfit

+    virtual void setVisible(bool visible);

+

+    /*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);

+    /*virtual*/ void onAdd(LLNotificationPtr notify);

+

+    void setSysWellChiclet(LLSysWellChiclet* chiclet);

+    void closeAll();

+

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

+

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

+    static constexpr S32 MAX_WINDOW_HEIGHT      = 200;

+    static constexpr S32 MIN_WINDOW_WIDTH       = 318;

+

+private:

+    // init Window's channel

+    virtual void initChannel();

+

+    const std::string NOTIFICATION_TABBED_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;

+

+    /**

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

+     */

+    LLSysWellChiclet* mSysWellChiclet;

+

+    bool mIsReshapedByUser;

+

+    struct NotificationTabbedChannel : public LLNotificationChannel

+    {

+        NotificationTabbedChannel(LLFloaterNotificationsTabbed*);

+        void onDelete(LLNotificationPtr notify)

+        {

+            mNotificationsTabbedWindow->removeItemByID(notify->getID(), notify->getName());

+        }

+

+        LLFloaterNotificationsTabbed* mNotificationsTabbedWindow;

+    };

+

+    LLNotificationChannelPtr mNotificationUpdates;

+    virtual const std::string& getAnchorViewName() { return NOTIFICATION_TABBED_ANCHOR_NAME; }

+

+    // init Window's channel

+    // void initChannel();

+    void clearScreenChannels();

+    // Operating with items

+    void addItem(LLNotificationListItem::Params p);

+    void getAllItemsOnCurrentTab(std::vector<LLPanel*>& items) const;

+

+    // Closes all notifications and removes them from the Notification Well

+    void closeAllOnCurrentTab();

+    void collapseAllOnCurrentTab();

+

+    void onStoreToast(LLPanel* info_panel, LLUUID id);

+    void onClickDeleteAllBtn();

+    void onClickCollapseAllBtn();

+    // Handlers

+    void onItemClick(LLNotificationListItem* item);

+    void onItemClose(LLNotificationListItem* item);

+    // ID of a toast loaded by user (by clicking notification well item)

+    LLUUID mLoadedToastId;

+

+    LLNotificationListView* mGroupInviteMessageList;

+    LLNotificationListView* mGroupNoticeMessageList;

+    LLNotificationListView* mTransactionMessageList;

+    LLNotificationListView* mSystemMessageList;

+    LLNotificationSeparator* mNotificationsSeparator;

+    LLTabContainer* mNotificationsTabContainer;

+    LLButton*   mDeleteAllBtn;

+    LLButton*   mCollapseAllBtn;

+};

+

+#endif // LL_FLOATERNOTIFICATIONSTABBED_H

+

+

+