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, 123 insertions, 122 deletions

diff --git a/indra/newview/llfloateremojipicker.h b/indra/newview/llfloateremojipicker.h
index c35616e054..31d5b0085a 100644
--- a/indra/newview/llfloateremojipicker.h
+++ b/indra/newview/llfloateremojipicker.h
@@ -1,122 +1,123 @@
-/**
- * @file llfloateremojipicker.h
- * @brief Header file for llfloateremojipicker
- *
- * $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 LLFLOATEREMOJIPICKER_H
-#define LLFLOATEREMOJIPICKER_H
-
-#include "llfloater.h"
-
-class LLEmojiGridRow;
-class LLEmojiGridIcon;
-struct LLEmojiDescriptor;
-struct LLEmojiSearchResult;
-
-class LLFloaterEmojiPicker : public LLFloater
-{
-    using super = LLFloater;
-
-public:
-    // The callback function will be called with an emoji char.
-    typedef boost::function<void (llwchar)> pick_callback_t;
-    typedef boost::function<void ()> close_callback_t;
-
-    LLFloaterEmojiPicker(const LLSD& key);
-
-    virtual	bool postBuild() override;
-    virtual void dirtyRect() override;
-    virtual void goneFromFront() override;
-
-    void hideFloater() const;
-
-    static std::list<llwchar>& getRecentlyUsed();
-    static void onEmojiUsed(llwchar emoji);
-
-    static void loadState();
-    static void saveState();
-
-private:
-    void initialize();
-    void fillGroups();
-    void fillCategoryRecentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats);
-    void fillCategoryFrequentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats);
-    void fillGroupEmojis(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats, U32 index);
-    void createGroupButton(LLButton::Params& params, const LLRect& rect, llwchar emoji);
-    void resizeGroupButtons();
-    void selectEmojiGroup(U32 index);
-    void fillEmojis(bool fromResize = false);
-    void fillEmojisCategory(const std::vector<LLEmojiSearchResult>& emojis,
-        const std::string& category, const LLPanel::Params& row_panel_params, const LLUICtrl::Params& row_list_params,
-        const LLPanel::Params& icon_params, const LLRect& icon_rect, S32 max_icons, const LLColor4& bg);
-    void createEmojiIcon(const LLEmojiSearchResult& emoji,
-        const std::string& category, const LLPanel::Params& row_panel_params, const LLUICtrl::Params& row_list_params,
-        const LLPanel::Params& icon_params, const LLRect& icon_rect, S32 max_icons, const LLColor4& bg,
-        LLEmojiGridRow*& row, int& icon_index);
-    void showPreview(bool show);
-
-    void onGroupButtonClick(LLUICtrl* ctrl);
-    void onGroupButtonMouseEnter(LLUICtrl* ctrl);
-    void onGroupButtonMouseLeave(LLUICtrl* ctrl);
-    void onEmojiMouseEnter(LLUICtrl* ctrl);
-    void onEmojiMouseLeave(LLUICtrl* ctrl);
-    void onEmojiMouseDown(LLUICtrl* ctrl);
-    void onEmojiMouseUp(LLUICtrl* ctrl);
-
-    void selectFocusedIcon();
-    bool moveFocusedIconUp();
-    bool moveFocusedIconDown();
-    bool moveFocusedIconPrev();
-    bool moveFocusedIconNext();
-
-    void selectGridIcon(LLEmojiGridIcon* icon);
-    void unselectGridIcon(LLEmojiGridIcon* icon);
-
-    void onOpen(const LLSD& key) override;
-    virtual bool handleKey(KEY key, MASK mask, bool called_from_parent) override;
-
-    class LLPanel* mGroups { nullptr };
-    class LLPanel* mBadge { nullptr };
-    class LLScrollContainer* mEmojiScroll { nullptr };
-    class LLScrollingPanelList* mEmojiGrid { nullptr };
-    class LLEmojiPreviewPanel* mPreview { nullptr };
-    class LLTextBox* mDummy { nullptr };
-
-    std::vector<S32> mFilteredEmojiGroups;
-    std::vector<std::map<std::string, std::vector<LLEmojiSearchResult>>> mFilteredEmojis;
-    std::vector<class LLButton*> mGroupButtons;
-
-    std::string mHint;
-    std::string mFilterPattern;
-    U32 mSelectedGroupIndex { 0 };
-    S32 mRecentMaxIcons { 0 };
-    S32 mFocusedIconRow { 0 };
-    S32 mFocusedIconCol { 0 };
-    LLEmojiGridIcon* mFocusedIcon { nullptr };
-    LLEmojiGridIcon* mHoveredIcon { nullptr };
-
-    U64 mRecentReturnPressedMs { 0 };
-};
-
-#endif
+/**

+ * @file llfloateremojipicker.h

+ * @brief Header file for llfloateremojipicker

+ *

+ * $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 LLFLOATEREMOJIPICKER_H

+#define LLFLOATEREMOJIPICKER_H

+

+#include "llfloater.h"

+

+class LLEmojiGridRow;

+class LLEmojiGridIcon;

+struct LLEmojiDescriptor;

+struct LLEmojiSearchResult;

+

+class LLFloaterEmojiPicker : public LLFloater

+{

+    using super = LLFloater;

+

+public:

+    // The callback function will be called with an emoji char.

+    typedef boost::function<void (llwchar)> pick_callback_t;

+    typedef boost::function<void ()> close_callback_t;

+

+    LLFloaterEmojiPicker(const LLSD& key);

+

+    virtual bool postBuild() override;

+    virtual void dirtyRect() override;

+    virtual void goneFromFront() override;

+

+    void hideFloater() const;

+

+    static std::list<llwchar>& getRecentlyUsed();

+    static void onEmojiUsed(llwchar emoji);

+

+    static void loadState();

+    static void saveState();

+

+private:

+    void initialize();

+    void fillGroups();

+    void fillCategoryRecentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats);

+    void fillCategoryFrequentlyUsed(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats);

+    void fillGroupEmojis(std::map<std::string, std::vector<LLEmojiSearchResult>>& cats, U32 index);

+    void createGroupButton(LLButton::Params& params, const LLRect& rect, llwchar emoji);

+    void resizeGroupButtons();

+    void selectEmojiGroup(U32 index);

+    void fillEmojis(bool fromResize = false);

+    void fillEmojisCategory(const std::vector<LLEmojiSearchResult>& emojis,

+        const std::string& category, const LLPanel::Params& row_panel_params, const LLUICtrl::Params& row_list_params,

+        const LLPanel::Params& icon_params, const LLRect& icon_rect, S32 max_icons, const LLColor4& bg);

+    void createEmojiIcon(const LLEmojiSearchResult& emoji,

+        const std::string& category, const LLPanel::Params& row_panel_params, const LLUICtrl::Params& row_list_params,

+        const LLPanel::Params& icon_params, const LLRect& icon_rect, S32 max_icons, const LLColor4& bg,

+        LLEmojiGridRow*& row, int& icon_index);

+    void showPreview(bool show);

+

+    void onGroupButtonClick(LLUICtrl* ctrl);

+    void onGroupButtonMouseEnter(LLUICtrl* ctrl);

+    void onGroupButtonMouseLeave(LLUICtrl* ctrl);

+    void onEmojiMouseEnter(LLUICtrl* ctrl);

+    void onEmojiMouseLeave(LLUICtrl* ctrl);

+    void onEmojiMouseDown(LLUICtrl* ctrl);

+    void onEmojiMouseUp(LLUICtrl* ctrl);

+

+    void selectFocusedIcon();

+    bool moveFocusedIconUp();

+    bool moveFocusedIconDown();

+    bool moveFocusedIconPrev();

+    bool moveFocusedIconNext();

+

+    void selectGridIcon(LLEmojiGridIcon* icon);

+    void unselectGridIcon(LLEmojiGridIcon* icon);

+

+    void onOpen(const LLSD& key) override;

+    void onClose(bool app_quitting) override;

+    virtual bool handleKey(KEY key, MASK mask, bool called_from_parent) override;

+

+    class LLPanel* mGroups { nullptr };

+    class LLPanel* mBadge { nullptr };

+    class LLScrollContainer* mEmojiScroll { nullptr };

+    class LLScrollingPanelList* mEmojiGrid { nullptr };

+    class LLEmojiPreviewPanel* mPreview { nullptr };

+    class LLTextBox* mDummy { nullptr };

+

+    std::vector<S32> mFilteredEmojiGroups;

+    std::vector<std::map<std::string, std::vector<LLEmojiSearchResult>>> mFilteredEmojis;

+    std::vector<class LLButton*> mGroupButtons;

+

+    std::string mHint;

+    std::string mFilterPattern;

+    U32 mSelectedGroupIndex { 0 };

+    S32 mRecentMaxIcons { 0 };

+    S32 mFocusedIconRow { 0 };

+    S32 mFocusedIconCol { 0 };

+    LLEmojiGridIcon* mFocusedIcon { nullptr };

+    LLEmojiGridIcon* mHoveredIcon { nullptr };

+

+    U64 mRecentReturnPressedMs { 0 };

+};

+

+#endif