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

diff --git a/indra/newview/llnotificationlistitem.h b/indra/newview/llnotificationlistitem.h
index d686fb5941..f89be9b374 100644
--- a/indra/newview/llnotificationlistitem.h
+++ b/indra/newview/llnotificationlistitem.h
@@ -1,251 +1,251 @@
-/** 
- * @file llnotificationlistitem.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_LLNOTIFICATIONLISTITEM_H
-#define LL_LLNOTIFICATIONLISTITEM_H
-
-#include "llpanel.h"
-#include "lllayoutstack.h"
-#include "lltextbox.h"
-#include "llviewertexteditor.h"
-#include "llbutton.h"
-#include "llgroupiconctrl.h"
-#include "llavatariconctrl.h"
-#include "llchatentry.h"
-#include "llgroupmgr.h"
-#include "llviewermessage.h"
-
-#include <string>
-
-class LLNotificationListItem : public LLPanel
-{
-public:
-    struct Params : public LLInitParam::Block<Params, LLPanel::Params>
-    {
-        LLUUID          notification_id;
-        LLUUID			transaction_id;
-        LLUUID          group_id;
-        LLUUID          paid_from_id;
-        LLUUID          paid_to_id;
-        std::string     notification_name;
-        std::string     title;
-        std::string     subject;
-        std::string     message;
-        std::string     sender;
-        S32             fee;
-        U8              use_offline_cap;
-        LLDate          time_stamp;
-        LLDate          received_time;
-        LLSD            inventory_offer;
-        e_notification_priority notification_priority;
-        Params()        {};
-    };
-
-    static LLNotificationListItem* create(const Params& p);
-
-    static std::set<std::string> getTransactionTypes();
-    static std::set<std::string> getGroupInviteTypes();
-    static std::set<std::string> getGroupNoticeTypes();
-
-    // title
-    void setTitle( std::string title );
-
-    // get item's ID
-    LLUUID getID() { return mParams.notification_id; }
-    std::string& getTitle() { return mTitle; }
-    std::string& getNotificationName() { return mNotificationName; }
-
-    // handlers
-    virtual bool handleMouseUp(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 (LLNotificationListItem* item)> item_callback_t;
-    typedef boost::signals2::signal<void (LLNotificationListItem* item)> item_signal_t;
-    item_signal_t mOnItemClose;
-    item_signal_t mOnItemClick;
-    boost::signals2::connection setOnItemCloseCallback(item_callback_t cb) { return mOnItemClose.connect(cb); }
-    boost::signals2::connection setOnItemClickCallback(item_callback_t cb) { return mOnItemClick.connect(cb); }
-    
-    virtual bool showPopup() { return true; }
-    void setExpanded(bool value);
-    virtual bool postBuild();
-    void reshapeNotification();
-
-    typedef enum e_time_type
-	{
-		SLT = 1,
-		Local = 2,
-		UTC = 3,
-	}ETimeType;
-
-protected:
-    LLNotificationListItem(const Params& p);
-    virtual ~LLNotificationListItem();
-
-    static std::string buildNotificationDate(const LLDate& time_stamp, ETimeType time_type = SLT);
-    void onClickExpandBtn();
-    void onClickCondenseBtn();
-    void onClickCloseBtn();
-    virtual void close() {};
-
-    Params              mParams;
-    LLTextBox*          mTitleBox;
-    LLTextBox*          mTitleBoxExp;
-    LLChatEntry* mNoticeTextExp;
-    LLTextBox*          mTimeBox;
-    LLTextBox*          mTimeBoxExp;
-    LLButton*           mExpandBtn;
-    LLButton*           mCondenseBtn;
-    LLButton*           mCloseBtn;
-    LLButton*           mCloseBtnExp;
-    LLPanel*            mCondensedViewPanel;
-    LLPanel*            mExpandedViewPanel;
-    std::string         mTitle;
-    std::string         mNotificationName;
-    S32                 mCondensedHeight;
-    S32                 mExpandedHeight;
-    S32                 mExpandedHeightResize;
-    bool                mExpanded;
-};
-
-class LLGroupNotificationListItem
-    : public LLNotificationListItem, public LLGroupMgrObserver
-{
-public:
-	virtual ~LLGroupNotificationListItem();
-    virtual bool postBuild();
-
-    void setGroupId(const LLUUID& value);
-    // LLGroupMgrObserver observer trigger
-    virtual void changed(LLGroupChange gc);
-
-    friend class LLNotificationListItem;
-protected:
-    LLGroupNotificationListItem(const Params& p);
-
-    LLGroupIconCtrl* mGroupIcon;
-    LLGroupIconCtrl* mGroupIconExp;
-    LLUUID      mGroupId;
-    LLTextBox*  mSenderOrFeeBox;
-    LLTextBox*  mSenderOrFeeBoxExp;
-    LLTextBox*  mGroupNameBoxExp;
-
-private:
-    LLGroupNotificationListItem(const LLGroupNotificationListItem &);
-    LLGroupNotificationListItem & operator=(LLGroupNotificationListItem &);
-
-    void setGroupName(std::string name);
-    bool updateFromCache();
-};
-
-class LLGroupInviteNotificationListItem
-    : public LLGroupNotificationListItem
-{
-public:
-    static std::set<std::string> getTypes();
-    virtual bool postBuild();
-
-    /*virtual*/ bool showPopup() { return false; }
-
-private:
-    friend class LLNotificationListItem;
-    LLGroupInviteNotificationListItem(const Params& p);
-    LLGroupInviteNotificationListItem(const LLGroupInviteNotificationListItem &);
-    LLGroupInviteNotificationListItem & operator=(LLGroupInviteNotificationListItem &);
-
-    void setFee(S32 fee);
-
-    void onClickJoinBtn();
-    void onClickDeclineBtn();
-    void onClickInfoBtn();
-
-    LLPanel*        mInviteButtonPanel;
-    LLButton*		mJoinBtn;
-    LLButton*		mDeclineBtn;
-    LLButton*		mInfoBtn;
-};
-
-class LLGroupNoticeNotificationListItem
-    : public LLGroupNotificationListItem
-{
-public:
-    static std::set<std::string> getTypes();
-    virtual bool postBuild();
-
-    /*virtual*/ bool showPopup() { return false; }
-
-private:
-    friend class LLNotificationListItem;
-    LLGroupNoticeNotificationListItem(const Params& p);
-    LLGroupNoticeNotificationListItem(const LLGroupNoticeNotificationListItem &);
-    LLGroupNoticeNotificationListItem & operator=(LLGroupNoticeNotificationListItem &);
-
-    void setSender(std::string sender);
-    void onClickAttachment();
-    /*virtual*/ void close();
-
-    static bool isAttachmentOpenable(LLAssetType::EType);
-
-    LLPanel*        mAttachmentPanel;
-    LLTextBox*      mAttachmentTextBox;
-    LLIconCtrl*     mAttachmentIcon;
-    LLIconCtrl*     mAttachmentIconExp;
-    LLOfferInfo*    mInventoryOffer;
-};
-
-class LLTransactionNotificationListItem : public LLNotificationListItem
-{
-public:
-    static std::set<std::string> getTypes();
-    virtual bool postBuild();
-private:
-    friend class LLNotificationListItem;
-    LLTransactionNotificationListItem(const Params& p);
-    LLTransactionNotificationListItem(const LLTransactionNotificationListItem &);
-    LLTransactionNotificationListItem & operator=(LLTransactionNotificationListItem &);
-    LLAvatarIconCtrl* mAvatarIcon;
-    LLAvatarIconCtrl* mAvatarIconExp;
-};
-
-class LLSystemNotificationListItem : public LLNotificationListItem
-{
-public:
-    virtual bool postBuild();
-private:
-    friend class LLNotificationListItem;
-    LLSystemNotificationListItem(const Params& p);
-    LLSystemNotificationListItem(const LLSystemNotificationListItem &);
-    LLSystemNotificationListItem & operator=(LLSystemNotificationListItem &);
-    LLIconCtrl* mSystemNotificationIcon;
-    LLIconCtrl* mSystemNotificationIconExp;
-    bool mIsCaution;
-};
-
-#endif // LL_LLNOTIFICATIONLISTITEM_H
-
-
+/**

+ * @file llnotificationlistitem.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_LLNOTIFICATIONLISTITEM_H

+#define LL_LLNOTIFICATIONLISTITEM_H

+

+#include "llpanel.h"

+#include "lllayoutstack.h"

+#include "lltextbox.h"

+#include "llviewertexteditor.h"

+#include "llbutton.h"

+#include "llgroupiconctrl.h"

+#include "llavatariconctrl.h"

+#include "llchatentry.h"

+#include "llgroupmgr.h"

+#include "llviewermessage.h"

+

+#include <string>

+

+class LLNotificationListItem : public LLPanel

+{

+public:

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

+    {

+        LLUUID          notification_id;

+        LLUUID          transaction_id;

+        LLUUID          group_id;

+        LLUUID          paid_from_id;

+        LLUUID          paid_to_id;

+        std::string     notification_name;

+        std::string     title;

+        std::string     subject;

+        std::string     message;

+        std::string     sender;

+        S32             fee;

+        U8              use_offline_cap;

+        LLDate          time_stamp;

+        LLDate          received_time;

+        LLSD            inventory_offer;

+        e_notification_priority notification_priority;

+        Params()        {};

+    };

+

+    static LLNotificationListItem* create(const Params& p);

+

+    static std::set<std::string> getTransactionTypes();

+    static std::set<std::string> getGroupInviteTypes();

+    static std::set<std::string> getGroupNoticeTypes();

+

+    // title

+    void setTitle( std::string title );

+

+    // get item's ID

+    LLUUID getID() { return mParams.notification_id; }

+    std::string& getTitle() { return mTitle; }

+    std::string& getNotificationName() { return mNotificationName; }

+

+    // handlers

+    virtual bool handleMouseUp(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 (LLNotificationListItem* item)> item_callback_t;

+    typedef boost::signals2::signal<void (LLNotificationListItem* item)> item_signal_t;

+    item_signal_t mOnItemClose;

+    item_signal_t mOnItemClick;

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

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

+

+    virtual bool showPopup() { return true; }

+    void setExpanded(bool value);

+    virtual bool postBuild();

+    void reshapeNotification();

+

+    typedef enum e_time_type

+    {

+        SLT = 1,

+        Local = 2,

+        UTC = 3,

+    }ETimeType;

+

+protected:

+    LLNotificationListItem(const Params& p);

+    virtual ~LLNotificationListItem();

+

+    static std::string buildNotificationDate(const LLDate& time_stamp, ETimeType time_type = SLT);

+    void onClickExpandBtn();

+    void onClickCondenseBtn();

+    void onClickCloseBtn();

+    virtual void close() {};

+

+    Params              mParams;

+    LLTextBox*          mTitleBox;

+    LLTextBox*          mTitleBoxExp;

+    LLChatEntry* mNoticeTextExp;

+    LLTextBox*          mTimeBox;

+    LLTextBox*          mTimeBoxExp;

+    LLButton*           mExpandBtn;

+    LLButton*           mCondenseBtn;

+    LLButton*           mCloseBtn;

+    LLButton*           mCloseBtnExp;

+    LLPanel*            mCondensedViewPanel;

+    LLPanel*            mExpandedViewPanel;

+    std::string         mTitle;

+    std::string         mNotificationName;

+    S32                 mCondensedHeight;

+    S32                 mExpandedHeight;

+    S32                 mExpandedHeightResize;

+    bool                mExpanded;

+};

+

+class LLGroupNotificationListItem

+    : public LLNotificationListItem, public LLGroupMgrObserver

+{

+public:

+    virtual ~LLGroupNotificationListItem();

+    virtual bool postBuild();

+

+    void setGroupId(const LLUUID& value);

+    // LLGroupMgrObserver observer trigger

+    virtual void changed(LLGroupChange gc);

+

+    friend class LLNotificationListItem;

+protected:

+    LLGroupNotificationListItem(const Params& p);

+

+    LLGroupIconCtrl* mGroupIcon;

+    LLGroupIconCtrl* mGroupIconExp;

+    LLUUID      mGroupId;

+    LLTextBox*  mSenderOrFeeBox;

+    LLTextBox*  mSenderOrFeeBoxExp;

+    LLTextBox*  mGroupNameBoxExp;

+

+private:

+    LLGroupNotificationListItem(const LLGroupNotificationListItem &);

+    LLGroupNotificationListItem & operator=(LLGroupNotificationListItem &);

+

+    void setGroupName(std::string name);

+    bool updateFromCache();

+};

+

+class LLGroupInviteNotificationListItem

+    : public LLGroupNotificationListItem

+{

+public:

+    static std::set<std::string> getTypes();

+    virtual bool postBuild();

+

+    /*virtual*/ bool showPopup() { return false; }

+

+private:

+    friend class LLNotificationListItem;

+    LLGroupInviteNotificationListItem(const Params& p);

+    LLGroupInviteNotificationListItem(const LLGroupInviteNotificationListItem &);

+    LLGroupInviteNotificationListItem & operator=(LLGroupInviteNotificationListItem &);

+

+    void setFee(S32 fee);

+

+    void onClickJoinBtn();

+    void onClickDeclineBtn();

+    void onClickInfoBtn();

+

+    LLPanel*        mInviteButtonPanel;

+    LLButton*       mJoinBtn;

+    LLButton*       mDeclineBtn;

+    LLButton*       mInfoBtn;

+};

+

+class LLGroupNoticeNotificationListItem

+    : public LLGroupNotificationListItem

+{

+public:

+    static std::set<std::string> getTypes();

+    virtual bool postBuild();

+

+    /*virtual*/ bool showPopup() { return false; }

+

+private:

+    friend class LLNotificationListItem;

+    LLGroupNoticeNotificationListItem(const Params& p);

+    LLGroupNoticeNotificationListItem(const LLGroupNoticeNotificationListItem &);

+    LLGroupNoticeNotificationListItem & operator=(LLGroupNoticeNotificationListItem &);

+

+    void setSender(std::string sender);

+    void onClickAttachment();

+    /*virtual*/ void close();

+

+    static bool isAttachmentOpenable(LLAssetType::EType);

+

+    LLPanel*        mAttachmentPanel;

+    LLTextBox*      mAttachmentTextBox;

+    LLIconCtrl*     mAttachmentIcon;

+    LLIconCtrl*     mAttachmentIconExp;

+    LLOfferInfo*    mInventoryOffer;

+};

+

+class LLTransactionNotificationListItem : public LLNotificationListItem

+{

+public:

+    static std::set<std::string> getTypes();

+    virtual bool postBuild();

+private:

+    friend class LLNotificationListItem;

+    LLTransactionNotificationListItem(const Params& p);

+    LLTransactionNotificationListItem(const LLTransactionNotificationListItem &);

+    LLTransactionNotificationListItem & operator=(LLTransactionNotificationListItem &);

+    LLAvatarIconCtrl* mAvatarIcon;

+    LLAvatarIconCtrl* mAvatarIconExp;

+};

+

+class LLSystemNotificationListItem : public LLNotificationListItem

+{

+public:

+    virtual bool postBuild();

+private:

+    friend class LLNotificationListItem;

+    LLSystemNotificationListItem(const Params& p);

+    LLSystemNotificationListItem(const LLSystemNotificationListItem &);

+    LLSystemNotificationListItem & operator=(LLSystemNotificationListItem &);

+    LLIconCtrl* mSystemNotificationIcon;

+    LLIconCtrl* mSystemNotificationIconExp;

+    bool mIsCaution;

+};

+

+#endif // LL_LLNOTIFICATIONLISTITEM_H

+

+