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

diff --git a/indra/newview/llpanelplacestab.h b/indra/newview/llpanelplacestab.h
index 9c2acb83d6..cbdc97200d 100644
--- a/indra/newview/llpanelplacestab.h
+++ b/indra/newview/llpanelplacestab.h
@@ -1,78 +1,78 @@
-/** 
- * @file llpanelplacestab.h
- * @brief Tabs interface for Side Bar "Places" 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_LLPANELPLACESTAB_H
-#define LL_LLPANELPLACESTAB_H
-
-#include "llpanel.h"
-
-class LLPanelPlaces;
-class LLToggleableMenu;
-
-class LLPanelPlacesTab : public LLPanel
-{
-public:
-	LLPanelPlacesTab() : LLPanel() {}
-	virtual ~LLPanelPlacesTab() {}
-
-	virtual void onSearchEdit(const std::string& string) = 0;
-	virtual void updateVerbs() = 0;		// Updates buttons at the bottom of Places panel
-	virtual void onShowOnMap() = 0;
-	virtual void onShowProfile() = 0;
-	virtual void onTeleport() = 0;
-	virtual void onRemoveSelected() = 0;
-	virtual bool isSingleItemSelected() = 0;
-
-    // returns menu for current selection
-    virtual LLToggleableMenu* getSelectionMenu() = 0;
-    virtual LLToggleableMenu* getSortingMenu() = 0;
-    virtual LLToggleableMenu* getCreateMenu() = 0;
-
-    /**
-    * Processes drag-n-drop of the Landmarks and folders into trash button.
-    */
-    virtual bool handleDragAndDropToTrash(bool drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept) = 0;
-
-	bool isTabVisible(); // Check if parent TabContainer is visible.
-
-	void onRegionResponse(const LLVector3d& landmark_global_pos,
-										U64 region_handle,
-										const std::string& url,
-										const LLUUID& snapshot_id,
-										bool teleport);
-
-	const std::string& getFilterSubString() { return sFilterSubString; }
-	void setFilterSubString(const std::string& string) { sFilterSubString = string; }
-
-	void setRemoveBtn(LLButton* trash_btn) { sRemoveBtn = trash_btn; }
-
-protected:
-	// Search string for filtering landmarks and teleport history locations
-	static std::string		sFilterSubString;
-	static LLButton*		sRemoveBtn;
-};
-
-#endif //LL_LLPANELPLACESTAB_H
+/**

+ * @file llpanelplacestab.h

+ * @brief Tabs interface for Side Bar "Places" 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_LLPANELPLACESTAB_H

+#define LL_LLPANELPLACESTAB_H

+

+#include "llpanel.h"

+

+class LLPanelPlaces;

+class LLToggleableMenu;

+

+class LLPanelPlacesTab : public LLPanel

+{

+public:

+    LLPanelPlacesTab() : LLPanel() {}

+    virtual ~LLPanelPlacesTab() {}

+

+    virtual void onSearchEdit(const std::string& string) = 0;

+    virtual void updateVerbs() = 0;     // Updates buttons at the bottom of Places panel

+    virtual void onShowOnMap() = 0;

+    virtual void onShowProfile() = 0;

+    virtual void onTeleport() = 0;

+    virtual void onRemoveSelected() = 0;

+    virtual bool isSingleItemSelected() = 0;

+

+    // returns menu for current selection

+    virtual LLToggleableMenu* getSelectionMenu() = 0;

+    virtual LLToggleableMenu* getSortingMenu() = 0;

+    virtual LLToggleableMenu* getCreateMenu() = 0;

+

+    /**

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

+    */

+    virtual bool handleDragAndDropToTrash(bool drop, EDragAndDropType cargo_type, void* cargo_data, EAcceptance* accept) = 0;

+

+    bool isTabVisible(); // Check if parent TabContainer is visible.

+

+    void onRegionResponse(const LLVector3d& landmark_global_pos,

+                                        U64 region_handle,

+                                        const std::string& url,

+                                        const LLUUID& snapshot_id,

+                                        bool teleport);

+

+    const std::string& getFilterSubString() { return sFilterSubString; }

+    void setFilterSubString(const std::string& string) { sFilterSubString = string; }

+

+    void setRemoveBtn(LLButton* trash_btn) { sRemoveBtn = trash_btn; }

+

+protected:

+    // Search string for filtering landmarks and teleport history locations

+    static std::string      sFilterSubString;

+    static LLButton*        sRemoveBtn;

+};

+

+#endif //LL_LLPANELPLACESTAB_H