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, 238 insertions, 235 deletions

diff --git a/indra/newview/llfloaterimsessiontab.h b/indra/newview/llfloaterimsessiontab.h
index 8a024611ff..2c9606892a 100644
--- a/indra/newview/llfloaterimsessiontab.h
+++ b/indra/newview/llfloaterimsessiontab.h
@@ -1,235 +1,238 @@
-/**
- * @file llfloaterimsessiontab.h
- * @brief LLFloaterIMSessionTab class implements the common behavior of LNearbyChatBar
- * @brief and LLFloaterIMSession for hosting both in LLIMContainer
- *
- * $LicenseInfo:firstyear=2012&license=viewerlgpl$
- * Second Life Viewer Source Code
- * Copyright (C) 2012, 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_FLOATERIMSESSIONTAB_H
-#define LL_FLOATERIMSESSIONTAB_H
-
-#include "lllayoutstack.h"
-#include "llparticipantlist.h"
-#include "lltransientdockablefloater.h"
-#include "llviewercontrol.h"
-#include "lleventtimer.h"
-#include "llimview.h"
-#include "llconversationmodel.h"
-#include "llconversationview.h"
-#include "lltexteditor.h"
-
-class LLPanelChatControlPanel;
-class LLChatEntry;
-class LLChatHistory;
-class LLPanelEmojiComplete;
-
-class LLFloaterIMSessionTab
-	: public LLTransientDockableFloater
-{
-	using super = LLTransientDockableFloater;
-
-public:
-	LOG_CLASS(LLFloaterIMSessionTab);
-
-	LLFloaterIMSessionTab(const LLSD& session_id);
-	~LLFloaterIMSessionTab();
-
-	// reload all message with new settings of visual modes
-	static void processChatHistoryStyleUpdate(bool clean_messages = false);
-	static void reloadEmptyFloaters();
-
-	/**
-	 * Returns true if chat is displayed in multi tabbed floater
-	 *         false if chat is displayed in multiple windows
-	 */
-	static bool isChatMultiTab();
-
-	// add conversation to container
-	static void addToHost(const LLUUID& session_id);
-
-	bool isHostAttached() {return mIsHostAttached;}
-	void setHostAttached(bool is_attached) {mIsHostAttached = is_attached;}
-
-	static LLFloaterIMSessionTab* findConversation(const LLUUID& uuid);
-	static LLFloaterIMSessionTab* getConversation(const LLUUID& uuid);
-
-	bool isNearbyChat() {return mIsNearbyChat;}
-
-	// LLFloater overrides
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ bool postBuild();
-	/*virtual*/ void draw();
-	/*virtual*/ void setVisible(bool visible);
-	/*virtual*/ void setFocus(bool focus);
-	/*virtual*/ void closeFloater(bool app_quitting = false);
-	
-	// Handle the left hand participant list widgets
-	void addConversationViewParticipant(LLConversationItem* item, bool update_view = true);
-	void removeConversationViewParticipant(const LLUUID& participant_id);
-	void updateConversationViewParticipant(const LLUUID& participant_id);
-	void refreshConversation();
-	void buildConversationViewParticipant();
-
-	void setSortOrder(const LLConversationSort& order);
-	virtual void onTearOffClicked();
-	void updateGearBtn();
-	void initBtns();
-	virtual void updateMessages() {}
-	LLConversationItem* getCurSelectedViewModelItem();
-	void forceReshape();
-	virtual bool handleKeyHere( KEY key, MASK mask );
-	bool isMessagePaneExpanded(){return mMessagePaneExpanded;}
-	void setMessagePaneExpanded(bool expanded){mMessagePaneExpanded = expanded;}
-	void restoreFloater();
-	void saveCollapsedState();
-
-	void updateChatIcon(const LLUUID& id);
-
-	LLView* getChatHistory();
-
-protected:
-
-	// callback for click on any items of the visual states menu
-	void onIMSessionMenuItemClicked(const LLSD& userdata);
-
-	// callback for check/uncheck of the expanded/collapse mode's switcher
-	bool onIMCompactExpandedMenuItemCheck(const LLSD& userdata);
-
-	//
-	bool onIMShowModesMenuItemCheck(const LLSD& userdata);
-	bool onIMShowModesMenuItemEnable(const LLSD& userdata);
-	static void onSlide(LLFloaterIMSessionTab *self);
-	static void onCollapseToLine(LLFloaterIMSessionTab *self);
-	void reshapeFloater(bool collapse);
-
-	// refresh a visual state of the Call button
-	void updateCallBtnState(bool callIsActive);
-
-	void hideOrShowTitle(); // toggle the floater's drag handle
-	void hideAllStandardButtons();
-
-	/// Update floater header and toolbar buttons when hosted/torn off state is toggled.
-	void updateHeaderAndToolbar();
-
-	// Update the input field help text and other places that need the session name
-	virtual void updateSessionName(const std::string& name);
-
-	// set the enable/disable state for the Call button
-	virtual void enableDisableCallBtn();
-
-	// process focus events to set a currently active session
-	/* virtual */ void onFocusReceived();
-	/* virtual */ void onFocusLost();
-
-	// prepare chat's params and out one message to chatHistory
-	void appendMessage(const LLChat& chat, const LLSD& args = LLSD());
-
-	std::string appendTime();
-	void assignResizeLimits();
-
-	void updateUsedEmojis(LLWString text);
-
-	S32  mFloaterExtraWidth;
-
-	bool mIsNearbyChat;
-	bool mIsP2PChat;
-
-	bool mMessagePaneExpanded;
-	bool mIsParticipantListExpanded;
-	S32 mMinFloaterHeight;
-
-	LLIMModel::LLIMSession* mSession;
-
-	// Participants list: model and view
-	LLConversationViewParticipant* createConversationViewParticipant(LLConversationItem* item);
-	
-	LLUUID mSessionID; 
-	LLLayoutStack* mBodyStack;
-	LLLayoutStack* mParticipantListAndHistoryStack;
-	LLLayoutPanel* mParticipantListPanel;	// add the widgets to that see mConversationsListPanel
-	LLLayoutPanel* mRightPartPanel;
-	LLLayoutPanel* mContentPanel;
-	LLLayoutPanel* mToolbarPanel;
-	LLLayoutPanel* mInputButtonPanel;
-	LLLayoutPanel* mEmojiRecentPanel;
-	LLTextBox* mEmojiRecentEmptyText;
-	LLPanelEmojiComplete* mEmojiRecentIconsCtrl;
-	LLParticipantList* getParticipantList();
-	conversations_widgets_map mConversationsWidgets;
-	LLConversationViewModel mConversationViewModel;
-	LLFolderView* mConversationsRoot;
-	LLScrollContainer* mScroller;
-
-	LLChatHistory* mChatHistory;
-	LLChatEntry* mInputEditor;
-	LLLayoutPanel* mChatLayoutPanel;
-	LLLayoutStack* mInputPanels;
-	
-	LLButton* mExpandCollapseLineBtn;
-	LLButton* mExpandCollapseBtn;
-	LLButton* mTearOffBtn;
-	LLButton* mEmojiRecentPanelToggleBtn;
-	LLButton* mEmojiPickerShowBtn;
-	LLButton* mCloseBtn;
-	LLButton* mGearBtn;
-	LLButton* mAddBtn;
-	LLButton* mVoiceButton;
-
-private:
-	// Handling selection and contextual menu
-	void doToSelected(const LLSD& userdata);
-	bool enableContextMenuItem(const LLSD& userdata);
-	bool checkContextMenuItem(const LLSD& userdata);
-	
-	void getSelectedUUIDs(uuid_vec_t& selected_uuids);
-	
-	/// Refreshes the floater at a constant rate.
-	virtual void refresh() = 0;
-
-	/**
-	 * Adjusts chat history height to fit vertically with input chat field
-	 * and avoid overlapping, since input chat field can be vertically expanded.
-	 * Implementation: chat history bottom "follows" top+top_pad of input chat field
-	 */
-	void reshapeChatLayoutPanel();
-
-	void onInputEditorClicked();
-
-	void onEmojiRecentPanelToggleBtnClicked();
-	void onEmojiPickerShowBtnClicked();
-	void initEmojiRecentPanel();
-	void onRecentEmojiPicked(const LLSD& value);
-
-	bool checkIfTornOff();
-	bool mIsHostAttached;
-	bool mHasVisibleBeenInitialized;
-
-	LLTimer* mRefreshTimer; ///< Defines the rate at which refresh() is called.
-
-	S32 mInputEditorPad;
-	S32 mChatLayoutPanelHeight;
-	S32 mFloaterHeight;
-};
-
-
-#endif /* LL_FLOATERIMSESSIONTAB_H */
+/**

+ * @file llfloaterimsessiontab.h

+ * @brief LLFloaterIMSessionTab class implements the common behavior of LNearbyChatBar

+ * @brief and LLFloaterIMSession for hosting both in LLIMContainer

+ *

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

+ * Second Life Viewer Source Code

+ * Copyright (C) 2012, 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_FLOATERIMSESSIONTAB_H

+#define LL_FLOATERIMSESSIONTAB_H

+

+#include "lllayoutstack.h"

+#include "llparticipantlist.h"

+#include "lltransientdockablefloater.h"

+#include "llviewercontrol.h"

+#include "lleventtimer.h"

+#include "llimview.h"

+#include "llconversationmodel.h"

+#include "llconversationview.h"

+#include "lltexteditor.h"

+

+class LLPanelChatControlPanel;

+class LLChatEntry;

+class LLChatHistory;

+class LLPanelEmojiComplete;

+

+class LLFloaterIMSessionTab

+    : public LLTransientDockableFloater

+{

+    using super = LLTransientDockableFloater;

+

+public:

+    LOG_CLASS(LLFloaterIMSessionTab);

+

+    LLFloaterIMSessionTab(const LLSD& session_id);

+    ~LLFloaterIMSessionTab();

+

+    // reload all message with new settings of visual modes

+    static void processChatHistoryStyleUpdate(bool clean_messages = false);

+    static void reloadEmptyFloaters();

+

+    /**

+     * Returns true if chat is displayed in multi tabbed floater

+     *         false if chat is displayed in multiple windows

+     */

+    static bool isChatMultiTab();

+

+    // add conversation to container

+    static void addToHost(const LLUUID& session_id);

+

+    bool isHostAttached() {return mIsHostAttached;}

+    void setHostAttached(bool is_attached) {mIsHostAttached = is_attached;}

+

+    static LLFloaterIMSessionTab* findConversation(const LLUUID& uuid);

+    static LLFloaterIMSessionTab* getConversation(const LLUUID& uuid);

+

+    bool isNearbyChat() {return mIsNearbyChat;}

+

+    // LLFloater overrides

+    /*virtual*/ void onOpen(const LLSD& key);

+    /*virtual*/ bool postBuild();

+    /*virtual*/ void draw();

+    /*virtual*/ void setVisible(bool visible);

+    /*virtual*/ void setFocus(bool focus);

+    /*virtual*/ void closeFloater(bool app_quitting = false);

+

+    // Handle the left hand participant list widgets

+    void addConversationViewParticipant(LLConversationItem* item, bool update_view = true);

+    void removeConversationViewParticipant(const LLUUID& participant_id);

+    void updateConversationViewParticipant(const LLUUID& participant_id);

+    void refreshConversation();

+    void buildConversationViewParticipant();

+

+    void setSortOrder(const LLConversationSort& order);

+    virtual void onTearOffClicked();

+    void updateGearBtn();

+    void initBtns();

+    virtual void updateMessages() {}

+    LLConversationItem* getCurSelectedViewModelItem();

+    void forceReshape();

+    virtual bool handleKeyHere( KEY key, MASK mask );

+    bool isMessagePaneExpanded(){return mMessagePaneExpanded;}

+    void setMessagePaneExpanded(bool expanded){mMessagePaneExpanded = expanded;}

+    void restoreFloater();

+    void saveCollapsedState();

+

+    void updateChatIcon(const LLUUID& id);

+

+    LLView* getChatHistory();

+

+protected:

+

+    // callback for click on any items of the visual states menu

+    void onIMSessionMenuItemClicked(const LLSD& userdata);

+

+    // callback for check/uncheck of the expanded/collapse mode's switcher

+    bool onIMCompactExpandedMenuItemCheck(const LLSD& userdata);

+

+    //

+    bool onIMShowModesMenuItemCheck(const LLSD& userdata);

+    bool onIMShowModesMenuItemEnable(const LLSD& userdata);

+    static void onSlide(LLFloaterIMSessionTab *self);

+    static void onCollapseToLine(LLFloaterIMSessionTab *self);

+    void reshapeFloater(bool collapse);

+

+    // refresh a visual state of the Call button

+    void updateCallBtnState(bool callIsActive);

+

+    void hideOrShowTitle(); // toggle the floater's drag handle

+    void hideAllStandardButtons();

+

+    /// Update floater header and toolbar buttons when hosted/torn off state is toggled.

+    void updateHeaderAndToolbar();

+

+    // Update the input field help text and other places that need the session name

+    virtual void updateSessionName(const std::string& name);

+

+    // set the enable/disable state for the Call button

+    virtual void enableDisableCallBtn();

+

+    // process focus events to set a currently active session

+    /* virtual */ void onFocusReceived();

+    /* virtual */ void onFocusLost();

+

+    // prepare chat's params and out one message to chatHistory

+    void appendMessage(const LLChat& chat, const LLSD& args = LLSD());

+

+    std::string appendTime();

+    void assignResizeLimits();

+

+    void updateUsedEmojis(LLWString text);

+

+    S32  mFloaterExtraWidth;

+

+    bool mIsNearbyChat;

+    bool mIsP2PChat;

+

+    bool mMessagePaneExpanded;

+    bool mIsParticipantListExpanded;

+    S32 mMinFloaterHeight;

+

+    LLIMModel::LLIMSession* mSession;

+

+    // Participants list: model and view

+    LLConversationViewParticipant* createConversationViewParticipant(LLConversationItem* item);

+

+    LLUUID mSessionID;

+    LLLayoutStack* mBodyStack;

+    LLLayoutStack* mParticipantListAndHistoryStack;

+    LLLayoutPanel* mParticipantListPanel;   // add the widgets to that see mConversationsListPanel

+    LLLayoutPanel* mRightPartPanel;

+    LLLayoutPanel* mContentPanel;

+    LLLayoutPanel* mToolbarPanel;

+    LLLayoutPanel* mInputButtonPanel;

+    LLLayoutPanel* mEmojiRecentPanel;

+    LLTextBox* mEmojiRecentEmptyText;

+    LLPanel* mEmojiRecentContainer;

+    LLPanelEmojiComplete* mEmojiRecentIconsCtrl;

+    LLParticipantList* getParticipantList();

+    conversations_widgets_map mConversationsWidgets;

+    LLConversationViewModel mConversationViewModel;

+    LLFolderView* mConversationsRoot;

+    LLScrollContainer* mScroller;

+

+    LLChatHistory* mChatHistory;

+    LLChatEntry* mInputEditor;

+    LLLayoutPanel* mChatLayoutPanel;

+    LLLayoutStack* mInputPanels;

+

+    LLButton* mExpandCollapseLineBtn;

+    LLButton* mExpandCollapseBtn;

+    LLButton* mTearOffBtn;

+    LLButton* mEmojiRecentPanelToggleBtn;

+    LLButton* mEmojiPickerShowBtn;

+    LLButton* mCloseBtn;

+    LLButton* mGearBtn;

+    LLButton* mAddBtn;

+    LLButton* mVoiceButton;

+

+private:

+    // Handling selection and contextual menu

+    void doToSelected(const LLSD& userdata);

+    bool enableContextMenuItem(const LLSD& userdata);

+    bool checkContextMenuItem(const LLSD& userdata);

+

+    void getSelectedUUIDs(uuid_vec_t& selected_uuids);

+

+    /// Refreshes the floater at a constant rate.

+    virtual void refresh() = 0;

+

+    /**

+     * Adjusts chat history height to fit vertically with input chat field

+     * and avoid overlapping, since input chat field can be vertically expanded.

+     * Implementation: chat history bottom "follows" top+top_pad of input chat field

+     */

+    void reshapeChatLayoutPanel();

+

+    void onInputEditorClicked();

+

+    void onEmojiRecentPanelToggleBtnClicked();

+    void onEmojiPickerShowBtnClicked();

+    void initEmojiRecentPanel();

+    void onEmojiRecentPanelFocusReceived();

+    void onEmojiRecentPanelFocusLost();

+    void onRecentEmojiPicked(const LLSD& value);

+

+    bool checkIfTornOff();

+    bool mIsHostAttached;

+    bool mHasVisibleBeenInitialized;

+

+    LLTimer* mRefreshTimer; ///< Defines the rate at which refresh() is called.

+

+    S32 mInputEditorPad;

+    S32 mChatLayoutPanelHeight;

+    S32 mFloaterHeight;

+};

+

+

+#endif /* LL_FLOATERIMSESSIONTAB_H */