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

diff --git a/indra/newview/llpanellandmarks.h b/indra/newview/llpanellandmarks.h
index 154c5fe505..9a17cf8ab1 100644
--- a/indra/newview/llpanellandmarks.h
+++ b/indra/newview/llpanellandmarks.h
@@ -1,169 +1,169 @@
-/**
- * @file llpanellandmarks.h
- * @brief Landmarks tab for Side Bar "Places" panel
- * class definition
- *
- * $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_LLPANELLANDMARKS_H
-#define LL_LLPANELLANDMARKS_H
-
-#include "lllandmark.h"
-
-// newview
-#include "llinventorymodel.h"
-#include "lllandmarklist.h"
-#include "llpanelplacestab.h"
-#include "llremoteparcelrequest.h"
-
-class LLAccordionCtrlTab;
-class LLFolderViewItem;
-class LLMenuButton;
-class LLMenuGL;
-class LLToggleableMenu;
-class LLInventoryPanel;
-class LLPlacesInventoryPanel;
-class LLFolderViewModelItemInventory;
-
-class LLLandmarksPanel : public LLPanelPlacesTab, LLRemoteParcelInfoObserver
-{
-public:
-	LLLandmarksPanel();
-	LLLandmarksPanel(bool is_landmark_panel);
-	virtual ~LLLandmarksPanel();
-
-	bool postBuild() override;
-	void onSearchEdit(const std::string& string) override;
-	void onShowOnMap() override;
-	void onShowProfile() override;
-	void onTeleport() override;
-	void onRemoveSelected() override;
-	void updateVerbs() override;
-	bool isSingleItemSelected() override;
-
-    LLToggleableMenu* getSelectionMenu() override;
-    LLToggleableMenu* getSortingMenu() override;
-    LLToggleableMenu* getCreateMenu() override;
-
-    /**
-     * Processes drag-n-drop of the Landmarks and folders into trash button.
-     */
-    bool handleDragAndDropToTrash(bool drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept) override;
-
-	void setCurrentSelectedList(LLPlacesInventoryPanel* inventory_list)
-	{
-		mCurrentSelectedList = inventory_list;
-	}
-
-	/**
-	 * Selects item with "obj_id" in one of accordion tabs.
-	 */
-	void setItemSelected(const LLUUID& obj_id, bool take_keyboard_focus);
-
-	void updateMenuVisibility(LLUICtrl* menu);
-
-	void doCreatePick(LLLandmark* landmark, const LLUUID &item_id );
-
-	void resetSelection();
-
-protected:
-	/**
-	 * @return true - if current selected panel is not null and selected item is a landmark
-	 */
-	bool isLandmarkSelected() const;
-	bool isFolderSelected() const;
-	void doActionOnCurSelectedLandmark(LLLandmarkList::loaded_callback_t cb);
-	LLFolderViewItem* getCurSelectedItem() const;
-	LLFolderViewModelItemInventory* getCurSelectedViewModelItem() const;
-
-	void updateSortOrder(LLInventoryPanel* panel, bool byDate);
-
-	//LLRemoteParcelInfoObserver interface
-	void processParcelInfo(const LLParcelData& parcel_data) override;
-	void setParcelID(const LLUUID& parcel_id) override;
-	void setErrorStatus(S32 status, const std::string& reason) override;
-
-	// List Commands Handlers
-	void initListCommandsHandlers();
-	void initLandmarksPanel(LLPlacesInventoryPanel* inventory_list);
-
-	LLPlacesInventoryPanel*		mCurrentSelectedList;
-	
-private:
-	void initLandmarksInventoryPanel();
-
-	void onTrashButtonClick() const;
-	void onAddAction(const LLSD& command_name) const;
-	void onClipboardAction(const LLSD& command_name) const;
-	void onFoldingAction(const LLSD& command_name);
-	bool isActionChecked(const LLSD& userdata) const;
-	bool isActionEnabled(const LLSD& command_name) const;
-	void onCustomAction(const LLSD& command_name);
-
-	/**
-	 * Updates context menu depending on the selected items location.
-	 *
-	 * For items in Trash category the menu includes the "Restore Item"
-	 * context menu entry.
-	 */
-	void onMenuVisibilityChange(LLUICtrl* ctrl, const LLSD& param);
-
-	/**
-	 * Determines if an item can be modified via context/gear menu.
-	 *
-	 * It validates Places Landmarks rules first. And then LLFolderView permissions.
-	 * For now it checks cut/rename/delete/paste actions.
-	 */
-	bool canItemBeModified(const std::string& command_name, LLFolderViewItem* item) const;
-
-	/**
-	 * Landmark actions callbacks. Fire when a landmark is loaded from the list.
-	 */
-	void doShowOnMap(LLLandmark* landmark);
-	void doProcessParcelInfo(LLLandmark* landmark,
-							 LLInventoryItem* inv_item,
-							 const LLParcelData& parcel_data);
-
-private:
-	LLPlacesInventoryPanel*		mLandmarksInventoryPanel;
-	LLToggleableMenu*			mGearLandmarkMenu;
-	LLToggleableMenu*			mGearFolderMenu;
-	LLToggleableMenu*			mSortingMenu;
-	LLToggleableMenu*			mAddMenu;
-
-	bool						isLandmarksPanel;
-	
-    LLUUID                      mCreatePickItemId; // item we requested a pick for
-};
-
-
-class LLFavoritesPanel : public LLLandmarksPanel
-{
-public:
-	LLFavoritesPanel();
-
-	bool postBuild() override;
-	void initFavoritesInventoryPanel();
-};
-
-#endif //LL_LLPANELLANDMARKS_H
+/**

+ * @file llpanellandmarks.h

+ * @brief Landmarks tab for Side Bar "Places" panel

+ * class definition

+ *

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

+#define LL_LLPANELLANDMARKS_H

+

+#include "lllandmark.h"

+

+// newview

+#include "llinventorymodel.h"

+#include "lllandmarklist.h"

+#include "llpanelplacestab.h"

+#include "llremoteparcelrequest.h"

+

+class LLAccordionCtrlTab;

+class LLFolderViewItem;

+class LLMenuButton;

+class LLMenuGL;

+class LLToggleableMenu;

+class LLInventoryPanel;

+class LLPlacesInventoryPanel;

+class LLFolderViewModelItemInventory;

+

+class LLLandmarksPanel : public LLPanelPlacesTab, LLRemoteParcelInfoObserver

+{

+public:

+    LLLandmarksPanel();

+    LLLandmarksPanel(bool is_landmark_panel);

+    virtual ~LLLandmarksPanel();

+

+    bool postBuild() override;

+    void onSearchEdit(const std::string& string) override;

+    void onShowOnMap() override;

+    void onShowProfile() override;

+    void onTeleport() override;

+    void onRemoveSelected() override;

+    void updateVerbs() override;

+    bool isSingleItemSelected() override;

+

+    LLToggleableMenu* getSelectionMenu() override;

+    LLToggleableMenu* getSortingMenu() override;

+    LLToggleableMenu* getCreateMenu() override;

+

+    /**

+     * Processes drag-n-drop of the Landmarks and folders into trash button.

+     */

+    bool handleDragAndDropToTrash(bool drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept) override;

+

+    void setCurrentSelectedList(LLPlacesInventoryPanel* inventory_list)

+    {

+        mCurrentSelectedList = inventory_list;

+    }

+

+    /**

+     * Selects item with "obj_id" in one of accordion tabs.

+     */

+    void setItemSelected(const LLUUID& obj_id, bool take_keyboard_focus);

+

+    void updateMenuVisibility(LLUICtrl* menu);

+

+    void doCreatePick(LLLandmark* landmark, const LLUUID &item_id );

+

+    void resetSelection();

+

+protected:

+    /**

+     * @return true - if current selected panel is not null and selected item is a landmark

+     */

+    bool isLandmarkSelected() const;

+    bool isFolderSelected() const;

+    void doActionOnCurSelectedLandmark(LLLandmarkList::loaded_callback_t cb);

+    LLFolderViewItem* getCurSelectedItem() const;

+    LLFolderViewModelItemInventory* getCurSelectedViewModelItem() const;

+

+    void updateSortOrder(LLInventoryPanel* panel, bool byDate);

+

+    //LLRemoteParcelInfoObserver interface

+    void processParcelInfo(const LLParcelData& parcel_data) override;

+    void setParcelID(const LLUUID& parcel_id) override;

+    void setErrorStatus(S32 status, const std::string& reason) override;

+

+    // List Commands Handlers

+    void initListCommandsHandlers();

+    void initLandmarksPanel(LLPlacesInventoryPanel* inventory_list);

+

+    LLPlacesInventoryPanel*     mCurrentSelectedList;

+

+private:

+    void initLandmarksInventoryPanel();

+

+    void onTrashButtonClick() const;

+    void onAddAction(const LLSD& command_name) const;

+    void onClipboardAction(const LLSD& command_name) const;

+    void onFoldingAction(const LLSD& command_name);

+    bool isActionChecked(const LLSD& userdata) const;

+    bool isActionEnabled(const LLSD& command_name) const;

+    void onCustomAction(const LLSD& command_name);

+

+    /**

+     * Updates context menu depending on the selected items location.

+     *

+     * For items in Trash category the menu includes the "Restore Item"

+     * context menu entry.

+     */

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

+

+    /**

+     * Determines if an item can be modified via context/gear menu.

+     *

+     * It validates Places Landmarks rules first. And then LLFolderView permissions.

+     * For now it checks cut/rename/delete/paste actions.

+     */

+    bool canItemBeModified(const std::string& command_name, LLFolderViewItem* item) const;

+

+    /**

+     * Landmark actions callbacks. Fire when a landmark is loaded from the list.

+     */

+    void doShowOnMap(LLLandmark* landmark);

+    void doProcessParcelInfo(LLLandmark* landmark,

+                             LLInventoryItem* inv_item,

+                             const LLParcelData& parcel_data);

+

+private:

+    LLPlacesInventoryPanel*     mLandmarksInventoryPanel;

+    LLToggleableMenu*           mGearLandmarkMenu;

+    LLToggleableMenu*           mGearFolderMenu;

+    LLToggleableMenu*           mSortingMenu;

+    LLToggleableMenu*           mAddMenu;

+

+    bool                        isLandmarksPanel;

+

+    LLUUID                      mCreatePickItemId; // item we requested a pick for

+};

+

+

+class LLFavoritesPanel : public LLLandmarksPanel

+{

+public:

+    LLFavoritesPanel();

+

+    bool postBuild() override;

+    void initFavoritesInventoryPanel();

+};

+

+#endif //LL_LLPANELLANDMARKS_H