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

diff --git a/indra/newview/llpanellandmarkinfo.h b/indra/newview/llpanellandmarkinfo.h
index e71413a8f6..5d169f3f16 100644
--- a/indra/newview/llpanellandmarkinfo.h
+++ b/indra/newview/llpanellandmarkinfo.h
@@ -1,105 +1,105 @@
-/**
- * @file llpanellandmarkinfo.h
- * @brief Displays landmark info in Side Tray.
- *
- * $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_LLPANELLANDMARKINFO_H
-#define LL_LLPANELLANDMARKINFO_H
-
-#include "llpanelplaceinfo.h"
-#include "llinventorymodel.h"
-
-class LLComboBox;
-class LLLineEditor;
-class LLTextEditor;
-
-class LLPanelLandmarkInfo : public LLPanelPlaceInfo
-{
-public:
-	LLPanelLandmarkInfo();
-	/*virtual*/ ~LLPanelLandmarkInfo();
-
-	/*virtual*/ bool postBuild();
-
-	/*virtual*/ void resetLocation();
-
-    // If landmark doesn't exists, will create it at default folder
-	/*virtual*/ void setInfoType(EInfoType type);
-
-    // Sets CREATE_LANDMARK infotype and creates landmark at desired folder
-    void setInfoAndCreateLandmark(const LLUUID& folder_id);
-
-	/*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);
-
-	// Displays landmark owner, creator and creation date info.
-	void displayItemInfo(const LLInventoryItem* pItem);
-
-	void toggleLandmarkEditMode(bool enabled);
-	void setCanEdit(bool enabled);
-
-	const std::string& getLandmarkTitle() const;
-	const std::string getLandmarkNotes() const;
-	const LLUUID getLandmarkFolder() const;
-
-	// Select current landmark folder in combobox.
-	bool setLandmarkFolder(const LLUUID& id);
-
-	typedef std::vector<LLPointer<LLViewerInventoryCategory> > cat_array_t;
-	static std::string getFullFolderName(const LLViewerInventoryCategory* cat);
-	static void collectLandmarkFolders(LLInventoryModel::cat_array_t& cats);
-
-private:
-    // Create a landmark for the current location
-    // in a folder specified by folder_id.
-    // Expects title and description to be initialized
-    void createLandmark(const LLUUID& folder_id);
-
-    // If landmark doesn't exists, will create it at specified folder
-    void setInfoType(EInfoType type, const LLUUID &folder_id);
-
-	void populateFoldersList();
-
-	LLTextBox*			mOwner;
-	LLTextBox*			mCreator;
-	LLTextBox*			mCreated;
-	LLLineEditor*		mLandmarkTitle;
-	LLLineEditor*		mLandmarkTitleEditor;
-	LLTextEditor*		mNotesEditor;
-	LLComboBox*			mFolderCombo;
-};
-
-class LLUpdateLandmarkParent : public LLInventoryCallback
-{
-public:
-	LLUpdateLandmarkParent(LLPointer<LLViewerInventoryItem> item, LLUUID new_parent) :
-		mItem(item),
-		mNewParentId(new_parent)
-	{};
-	/* virtual */ void fire(const LLUUID& inv_item_id);
-
-private:
-	LLPointer<LLViewerInventoryItem> mItem;
-	LLUUID mNewParentId;
-};
-#endif // LL_LLPANELLANDMARKINFO_H
+/**

+ * @file llpanellandmarkinfo.h

+ * @brief Displays landmark info in Side Tray.

+ *

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

+#define LL_LLPANELLANDMARKINFO_H

+

+#include "llpanelplaceinfo.h"

+#include "llinventorymodel.h"

+

+class LLComboBox;

+class LLLineEditor;

+class LLTextEditor;

+

+class LLPanelLandmarkInfo : public LLPanelPlaceInfo

+{

+public:

+    LLPanelLandmarkInfo();

+    /*virtual*/ ~LLPanelLandmarkInfo();

+

+    /*virtual*/ bool postBuild();

+

+    /*virtual*/ void resetLocation();

+

+    // If landmark doesn't exists, will create it at default folder

+    /*virtual*/ void setInfoType(EInfoType type);

+

+    // Sets CREATE_LANDMARK infotype and creates landmark at desired folder

+    void setInfoAndCreateLandmark(const LLUUID& folder_id);

+

+    /*virtual*/ void processParcelInfo(const LLParcelData& parcel_data);

+

+    // Displays landmark owner, creator and creation date info.

+    void displayItemInfo(const LLInventoryItem* pItem);

+

+    void toggleLandmarkEditMode(bool enabled);

+    void setCanEdit(bool enabled);

+

+    const std::string& getLandmarkTitle() const;

+    const std::string getLandmarkNotes() const;

+    const LLUUID getLandmarkFolder() const;

+

+    // Select current landmark folder in combobox.

+    bool setLandmarkFolder(const LLUUID& id);

+

+    typedef std::vector<LLPointer<LLViewerInventoryCategory> > cat_array_t;

+    static std::string getFullFolderName(const LLViewerInventoryCategory* cat);

+    static void collectLandmarkFolders(LLInventoryModel::cat_array_t& cats);

+

+private:

+    // Create a landmark for the current location

+    // in a folder specified by folder_id.

+    // Expects title and description to be initialized

+    void createLandmark(const LLUUID& folder_id);

+

+    // If landmark doesn't exists, will create it at specified folder

+    void setInfoType(EInfoType type, const LLUUID &folder_id);

+

+    void populateFoldersList();

+

+    LLTextBox*          mOwner;

+    LLTextBox*          mCreator;

+    LLTextBox*          mCreated;

+    LLLineEditor*       mLandmarkTitle;

+    LLLineEditor*       mLandmarkTitleEditor;

+    LLTextEditor*       mNotesEditor;

+    LLComboBox*         mFolderCombo;

+};

+

+class LLUpdateLandmarkParent : public LLInventoryCallback

+{

+public:

+    LLUpdateLandmarkParent(LLPointer<LLViewerInventoryItem> item, LLUUID new_parent) :

+        mItem(item),

+        mNewParentId(new_parent)

+    {};

+    /* virtual */ void fire(const LLUUID& inv_item_id);

+

+private:

+    LLPointer<LLViewerInventoryItem> mItem;

+    LLUUID mNewParentId;

+};

+#endif // LL_LLPANELLANDMARKINFO_H