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

diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h
index 058f34aa2f..18635c7a61 100644
--- a/indra/newview/llpanelpeople.h
+++ b/indra/newview/llpanelpeople.h
@@ -1,157 +1,157 @@
-/** 
- * @file llpanelpeople.h
- * @brief Side tray "People" panel
- *
- * $LicenseInfo:firstyear=2009&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_LLPANELPEOPLE_H
-#define LL_LLPANELPEOPLE_H
-
-#include <llpanel.h>
-
-#include "llcallingcard.h" // for avatar tracker
-#include "llfloaterwebcontent.h"
-#include "llvoiceclient.h"
-
-class LLAvatarList;
-class LLAvatarName;
-class LLFilterEditor;
-class LLGroupList;
-class LLMenuButton;
-class LLTabContainer;
-class LLNetMap;
-
-class LLPanelPeople 
-	: public LLPanel
-	, public LLVoiceClientStatusObserver
-{
-	LOG_CLASS(LLPanelPeople);
-public:
-	LLPanelPeople();
-	virtual ~LLPanelPeople();
-
-	bool postBuild() override;
-	void onOpen(const LLSD& key) override;
-	bool notifyChildren(const LLSD& info) override;
-	// Implements LLVoiceClientStatusObserver::onChange() to enable call buttons
-	// when voice is available
-	void onChange(EStatusType status, const std::string &channelURI, bool proximal) override;
-
-	// internals
-	class Updater;
-
-	bool updateNearbyArrivalTime();
-
-private:
-
-	typedef enum e_sort_oder {
-		E_SORT_BY_NAME = 0,
-		E_SORT_BY_STATUS = 1,
-		E_SORT_BY_MOST_RECENT = 2,
-		E_SORT_BY_DISTANCE = 3,
-		E_SORT_BY_RECENT_SPEAKERS = 4,
-		E_SORT_BY_RECENT_ARRIVAL = 5
-	} ESortOrder;
-
-    void				    removePicker();
-
-	// methods indirectly called by the updaters
-	void					updateFriendListHelpText();
-	void					updateFriendList();
-	void					updateNearbyList();
-	void					updateRecentList();
-
-	bool					isItemsFreeOfFriends(const uuid_vec_t& uuids);
-
-	void					updateButtons();
-	std::string				getActiveTabName() const;
-	LLUUID					getCurrentItemID() const;
-	void					getCurrentItemIDs(uuid_vec_t& selected_uuids) const;
-	void					setSortOrder(LLAvatarList* list, ESortOrder order, bool save = true);
-
-	// UI callbacks
-	void					onFilterEdit(const std::string& search_string);
-	void					onGroupLimitInfo();
-	void					onTabSelected(const LLSD& param);
-	void					onAddFriendButtonClicked();
-	void					onAddFriendWizButtonClicked();
-	void					onDeleteFriendButtonClicked();
-	void					onChatButtonClicked();
-	void					onGearButtonClicked(LLUICtrl* btn);
-	void					onImButtonClicked();
-	void					onMoreButtonClicked();
-	void					onAvatarListDoubleClicked(LLUICtrl* ctrl);
-	void					onAvatarListCommitted(LLAvatarList* list);
-	bool					onGroupPlusButtonValidate();
-	void					onGroupMinusButtonClicked();
-	void					onGroupPlusMenuItemClicked(const LLSD& userdata);
-
-	void					onFriendsViewSortMenuItemClicked(const LLSD& userdata);
-	void					onNearbyViewSortMenuItemClicked(const LLSD& userdata);
-	void					onGroupsViewSortMenuItemClicked(const LLSD& userdata);
-	void					onRecentViewSortMenuItemClicked(const LLSD& userdata);
-
-	bool					onFriendsViewSortMenuItemCheck(const LLSD& userdata);
-	bool					onRecentViewSortMenuItemCheck(const LLSD& userdata);
-	bool					onNearbyViewSortMenuItemCheck(const LLSD& userdata);
-
-	// misc callbacks
-	static void				onAvatarPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);
-
-	void					onFriendsAccordionExpandedCollapsed(LLUICtrl* ctrl, const LLSD& param, LLAvatarList* avatar_list);
-
-	void					showAccordion(const std::string name, bool show);
-
-	void					showFriendsAccordionsIfNeeded();
-
-	void					onFriendListRefreshComplete(LLUICtrl*ctrl, const LLSD& param);
-
-	void					setAccordionCollapsedByUser(LLUICtrl* acc_tab, bool collapsed);
-	void					setAccordionCollapsedByUser(const std::string& name, bool collapsed);
-	bool					isAccordionCollapsedByUser(LLUICtrl* acc_tab);
-	bool					isAccordionCollapsedByUser(const std::string& name);
-
-	LLTabContainer*			mTabContainer;
-	LLAvatarList*			mOnlineFriendList;
-	LLAvatarList*			mAllFriendList;
-	LLAvatarList*			mNearbyList;
-	LLAvatarList*			mRecentList;
-	LLGroupList*			mGroupList;
-	LLNetMap*				mMiniMap;
-
-	std::vector<std::string> mSavedOriginalFilters;
-	std::vector<std::string> mSavedFilters;
-
-	Updater*				mFriendListUpdater;
-	Updater*				mNearbyListUpdater;
-	Updater*				mRecentListUpdater;
-	Updater*				mButtonsUpdater;
-    LLHandle< LLFloater >	mPicker;
-
-    boost::signals2::connection mNearbyFilterCommitConnection;
-    boost::signals2::connection mFriedsFilterCommitConnection;
-    boost::signals2::connection mGroupsFilterCommitConnection;
-    boost::signals2::connection mRecentFilterCommitConnection;
-};
-
-#endif //LL_LLPANELPEOPLE_H
+/**

+ * @file llpanelpeople.h

+ * @brief Side tray "People" panel

+ *

+ * $LicenseInfo:firstyear=2009&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_LLPANELPEOPLE_H

+#define LL_LLPANELPEOPLE_H

+

+#include <llpanel.h>

+

+#include "llcallingcard.h" // for avatar tracker

+#include "llfloaterwebcontent.h"

+#include "llvoiceclient.h"

+

+class LLAvatarList;

+class LLAvatarName;

+class LLFilterEditor;

+class LLGroupList;

+class LLMenuButton;

+class LLTabContainer;

+class LLNetMap;

+

+class LLPanelPeople

+    : public LLPanel

+    , public LLVoiceClientStatusObserver

+{

+    LOG_CLASS(LLPanelPeople);

+public:

+    LLPanelPeople();

+    virtual ~LLPanelPeople();

+

+    bool postBuild() override;

+    void onOpen(const LLSD& key) override;

+    bool notifyChildren(const LLSD& info) override;

+    // Implements LLVoiceClientStatusObserver::onChange() to enable call buttons

+    // when voice is available

+    void onChange(EStatusType status, const std::string &channelURI, bool proximal) override;

+

+    // internals

+    class Updater;

+

+    bool updateNearbyArrivalTime();

+

+private:

+

+    typedef enum e_sort_oder {

+        E_SORT_BY_NAME = 0,

+        E_SORT_BY_STATUS = 1,

+        E_SORT_BY_MOST_RECENT = 2,

+        E_SORT_BY_DISTANCE = 3,

+        E_SORT_BY_RECENT_SPEAKERS = 4,

+        E_SORT_BY_RECENT_ARRIVAL = 5

+    } ESortOrder;

+

+    void                    removePicker();

+

+    // methods indirectly called by the updaters

+    void                    updateFriendListHelpText();

+    void                    updateFriendList();

+    void                    updateNearbyList();

+    void                    updateRecentList();

+

+    bool                    isItemsFreeOfFriends(const uuid_vec_t& uuids);

+

+    void                    updateButtons();

+    std::string             getActiveTabName() const;

+    LLUUID                  getCurrentItemID() const;

+    void                    getCurrentItemIDs(uuid_vec_t& selected_uuids) const;

+    void                    setSortOrder(LLAvatarList* list, ESortOrder order, bool save = true);

+

+    // UI callbacks

+    void                    onFilterEdit(const std::string& search_string);

+    void                    onGroupLimitInfo();

+    void                    onTabSelected(const LLSD& param);

+    void                    onAddFriendButtonClicked();

+    void                    onAddFriendWizButtonClicked();

+    void                    onDeleteFriendButtonClicked();

+    void                    onChatButtonClicked();

+    void                    onGearButtonClicked(LLUICtrl* btn);

+    void                    onImButtonClicked();

+    void                    onMoreButtonClicked();

+    void                    onAvatarListDoubleClicked(LLUICtrl* ctrl);

+    void                    onAvatarListCommitted(LLAvatarList* list);

+    bool                    onGroupPlusButtonValidate();

+    void                    onGroupMinusButtonClicked();

+    void                    onGroupPlusMenuItemClicked(const LLSD& userdata);

+

+    void                    onFriendsViewSortMenuItemClicked(const LLSD& userdata);

+    void                    onNearbyViewSortMenuItemClicked(const LLSD& userdata);

+    void                    onGroupsViewSortMenuItemClicked(const LLSD& userdata);

+    void                    onRecentViewSortMenuItemClicked(const LLSD& userdata);

+

+    bool                    onFriendsViewSortMenuItemCheck(const LLSD& userdata);

+    bool                    onRecentViewSortMenuItemCheck(const LLSD& userdata);

+    bool                    onNearbyViewSortMenuItemCheck(const LLSD& userdata);

+

+    // misc callbacks

+    static void             onAvatarPicked(const uuid_vec_t& ids, const std::vector<LLAvatarName> names);

+

+    void                    onFriendsAccordionExpandedCollapsed(LLUICtrl* ctrl, const LLSD& param, LLAvatarList* avatar_list);

+

+    void                    showAccordion(const std::string name, bool show);

+

+    void                    showFriendsAccordionsIfNeeded();

+

+    void                    onFriendListRefreshComplete(LLUICtrl*ctrl, const LLSD& param);

+

+    void                    setAccordionCollapsedByUser(LLUICtrl* acc_tab, bool collapsed);

+    void                    setAccordionCollapsedByUser(const std::string& name, bool collapsed);

+    bool                    isAccordionCollapsedByUser(LLUICtrl* acc_tab);

+    bool                    isAccordionCollapsedByUser(const std::string& name);

+

+    LLTabContainer*         mTabContainer;

+    LLAvatarList*           mOnlineFriendList;

+    LLAvatarList*           mAllFriendList;

+    LLAvatarList*           mNearbyList;

+    LLAvatarList*           mRecentList;

+    LLGroupList*            mGroupList;

+    LLNetMap*               mMiniMap;

+

+    std::vector<std::string> mSavedOriginalFilters;

+    std::vector<std::string> mSavedFilters;

+

+    Updater*                mFriendListUpdater;

+    Updater*                mNearbyListUpdater;

+    Updater*                mRecentListUpdater;

+    Updater*                mButtonsUpdater;

+    LLHandle< LLFloater >   mPicker;

+

+    boost::signals2::connection mNearbyFilterCommitConnection;

+    boost::signals2::connection mFriedsFilterCommitConnection;

+    boost::signals2::connection mGroupsFilterCommitConnection;

+    boost::signals2::connection mRecentFilterCommitConnection;

+};

+

+#endif //LL_LLPANELPEOPLE_H