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

diff --git a/indra/newview/lllandmarkactions.h b/indra/newview/lllandmarkactions.h
index f8b1f554f7..285354fdb7 100644
--- a/indra/newview/lllandmarkactions.h
+++ b/indra/newview/lllandmarkactions.h
@@ -1,132 +1,132 @@
-/** 
- * @file lllandmarkactions.h
- * @brief LLLandmark class declaration
- *
- * $LicenseInfo:firstyear=2000&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_LLLANDMARKACTIONS_H
-#define LL_LLLANDMARKACTIONS_H
-
-#include "llinventorymodel.h"
-
-#include "lllandmarklist.h"
-
-class LLLandmark;
-
-/**
- * @brief Provides helper functions to manage landmarks
- */
-class LLLandmarkActions
-{
-public:
-	typedef boost::function<void(std::string& slurl)> slurl_callback_t;
-	typedef boost::function<void(std::string& slurl, S32 x, S32 y, S32 z)> region_name_and_coords_callback_t;
-
-	/**
-	 * @brief Fetches landmark LLViewerInventoryItems for the given landmark name. 
-	 */
-	static LLInventoryModel::item_array_t fetchLandmarksByName(std::string& name, bool if_use_substring);
-	/**
-	 * @brief Checks whether landmark exists for current agent position.
-	 */
-	static bool landmarkAlreadyExists();
-	
-	/**
-	 * @brief Checks whether landmark exists for current agent parcel.
-	 */
-	static bool hasParcelLandmark();
-
-	/**
-	 * @brief Searches landmark for global position.
-	 * @return Returns landmark or NULL.
-	 * 
-	 * *TODO: dzaporozhan: There can be many landmarks for single parcel.
-	 */
-	static LLViewerInventoryItem* findLandmarkForGlobalPos(const LLVector3d &pos);
-
-	/**
-	 * @brief Searches landmark for agent global position.
-	 * @return Returns landmark or NULL.
-	 * 
-	 * *TODO: dzaporozhan: There can be many landmarks for single parcel.
-	 */
-	static LLViewerInventoryItem* findLandmarkForAgentPos();
-
-	/**
-	 * @brief Creates landmark for current parcel.
-	 */
-	static void createLandmarkHere();
-
-	/**
-	 * @brief Creates landmark for current parcel.
-	 */
-	static void createLandmarkHere(
-		const std::string& name, 
-		const std::string& desc, 
-		const LLUUID& folder_id);
-	/**
-	 * @brief Creates SLURL for given global position.
-	 */
-	static void getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_callback_t cb, bool escaped = true);
-
-	static void getRegionNameAndCoordsFromPosGlobal(const LLVector3d& global_pos, region_name_and_coords_callback_t cb);
-
-    /**
-     * @brief Gets landmark global position specified by inventory LLUUID.
-     * Found position is placed into "posGlobal" variable.
-     *.
-     * @return - true if specified item exists in Inventory and an appropriate landmark found.
-     * and its position is known, false otherwise.
-     */
-    // *TODO: mantipov: profide callback for cases, when Landmark is not loaded yet.
-    static bool getLandmarkGlobalPos(const LLUUID& landmarkInventoryItemID, LLVector3d& posGlobal);
-
-    /**
-     * @brief Retrieve a landmark from gLandmarkList by inventory item's id
-     * If a landmark is not currently in the gLandmarkList a callback "cb" is called when it is loaded.
-     * 
-     * @return pointer to loaded landmark from gLandmarkList or NULL if landmark does not exist or wasn't loaded.
-     */
-    static LLLandmark* getLandmark(const LLUUID& landmarkInventoryItemID, LLLandmarkList::loaded_callback_t cb = NULL);
-
-    /**
-     * @brief  Performs standard action of copying of SLURL from landmark to user's clipboard.
-     * 	This action requires additional server request. The user will be notified  by info message, 
-     *  when URL is copied .
-     */
-    static void copySLURLtoClipboard(const LLUUID& landmarkInventoryItemID);
-
-private:
-    LLLandmarkActions();
-    LLLandmarkActions(const LLLandmarkActions&);
-
-	static void onRegionResponseSLURL(slurl_callback_t cb,
-								 const LLVector3d& global_pos,
-								 bool escaped,
-								 const std::string& url);
-	static void onRegionResponseNameAndCoords(region_name_and_coords_callback_t cb,
-								 const LLVector3d& global_pos,
-								 U64 region_handle);
-};
-
-#endif //LL_LLLANDMARKACTIONS_H
+/**

+ * @file lllandmarkactions.h

+ * @brief LLLandmark class declaration

+ *

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

+#define LL_LLLANDMARKACTIONS_H

+

+#include "llinventorymodel.h"

+

+#include "lllandmarklist.h"

+

+class LLLandmark;

+

+/**

+ * @brief Provides helper functions to manage landmarks

+ */

+class LLLandmarkActions

+{

+public:

+    typedef boost::function<void(std::string& slurl)> slurl_callback_t;

+    typedef boost::function<void(std::string& slurl, S32 x, S32 y, S32 z)> region_name_and_coords_callback_t;

+

+    /**

+     * @brief Fetches landmark LLViewerInventoryItems for the given landmark name.

+     */

+    static LLInventoryModel::item_array_t fetchLandmarksByName(std::string& name, bool if_use_substring);

+    /**

+     * @brief Checks whether landmark exists for current agent position.

+     */

+    static bool landmarkAlreadyExists();

+

+    /**

+     * @brief Checks whether landmark exists for current agent parcel.

+     */

+    static bool hasParcelLandmark();

+

+    /**

+     * @brief Searches landmark for global position.

+     * @return Returns landmark or NULL.

+     *

+     * *TODO: dzaporozhan: There can be many landmarks for single parcel.

+     */

+    static LLViewerInventoryItem* findLandmarkForGlobalPos(const LLVector3d &pos);

+

+    /**

+     * @brief Searches landmark for agent global position.

+     * @return Returns landmark or NULL.

+     *

+     * *TODO: dzaporozhan: There can be many landmarks for single parcel.

+     */

+    static LLViewerInventoryItem* findLandmarkForAgentPos();

+

+    /**

+     * @brief Creates landmark for current parcel.

+     */

+    static void createLandmarkHere();

+

+    /**

+     * @brief Creates landmark for current parcel.

+     */

+    static void createLandmarkHere(

+        const std::string& name,

+        const std::string& desc,

+        const LLUUID& folder_id);

+    /**

+     * @brief Creates SLURL for given global position.

+     */

+    static void getSLURLfromPosGlobal(const LLVector3d& global_pos, slurl_callback_t cb, bool escaped = true);

+

+    static void getRegionNameAndCoordsFromPosGlobal(const LLVector3d& global_pos, region_name_and_coords_callback_t cb);

+

+    /**

+     * @brief Gets landmark global position specified by inventory LLUUID.

+     * Found position is placed into "posGlobal" variable.

+     *.

+     * @return - true if specified item exists in Inventory and an appropriate landmark found.

+     * and its position is known, false otherwise.

+     */

+    // *TODO: mantipov: profide callback for cases, when Landmark is not loaded yet.

+    static bool getLandmarkGlobalPos(const LLUUID& landmarkInventoryItemID, LLVector3d& posGlobal);

+

+    /**

+     * @brief Retrieve a landmark from gLandmarkList by inventory item's id

+     * If a landmark is not currently in the gLandmarkList a callback "cb" is called when it is loaded.

+     *

+     * @return pointer to loaded landmark from gLandmarkList or NULL if landmark does not exist or wasn't loaded.

+     */

+    static LLLandmark* getLandmark(const LLUUID& landmarkInventoryItemID, LLLandmarkList::loaded_callback_t cb = NULL);

+

+    /**

+     * @brief  Performs standard action of copying of SLURL from landmark to user's clipboard.

+     *  This action requires additional server request. The user will be notified  by info message,

+     *  when URL is copied .

+     */

+    static void copySLURLtoClipboard(const LLUUID& landmarkInventoryItemID);

+

+private:

+    LLLandmarkActions();

+    LLLandmarkActions(const LLLandmarkActions&);

+

+    static void onRegionResponseSLURL(slurl_callback_t cb,

+                                 const LLVector3d& global_pos,

+                                 bool escaped,

+                                 const std::string& url);

+    static void onRegionResponseNameAndCoords(region_name_and_coords_callback_t cb,

+                                 const LLVector3d& global_pos,

+                                 U64 region_handle);

+};

+

+#endif //LL_LLLANDMARKACTIONS_H