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

diff --git a/indra/newview/llagentui.h b/indra/newview/llagentui.h
index dcd715f87a..b382744739 100644
--- a/indra/newview/llagentui.h
+++ b/indra/newview/llagentui.h
@@ -1,59 +1,59 @@
-/** 
- * @file llagentui.h
- * @brief Utility methods to process agent's data as slurl's etc. before displaying
- *
- * $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 LLAGENTUI_H
-#define LLAGENTUI_H
-
-class LLSLURL;
-
-class LLAgentUI
-{
-public:
-	enum ELocationFormat
-	{
-		LOCATION_FORMAT_NORMAL,			// Parcel
-		LOCATION_FORMAT_NORMAL_COORDS,	// Parcel (x, y, z)
-		LOCATION_FORMAT_LANDMARK,		// Parcel, Region
-		LOCATION_FORMAT_NO_MATURITY,	// Parcel, Region (x, y, z)
-		LOCATION_FORMAT_NO_COORDS,		// Parcel, Region - Maturity
-		LOCATION_FORMAT_FULL,			// Parcel, Region (x, y, z) - Maturity
-	};
-
-	static void buildFullname(std::string &name);
-
-	static void buildSLURL(LLSLURL& slurl, const bool escaped = true);
-	//build location string using the current position of gAgent.
-	static bool buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK);
-	//build location string using a region position of the avatar. 
-	static bool buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region);
-	/**
-	 * @brief Check whether  the agent is in neighborhood of the pole  Within same region
-	 * @return true if the agent is in neighborhood.
-	 */
-	static bool checkAgentDistance(const LLVector3& local_pole, F32 radius);
-};
-
-#endif //LLAGENTUI_H
+/**

+ * @file llagentui.h

+ * @brief Utility methods to process agent's data as slurl's etc. before displaying

+ *

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

+#define LLAGENTUI_H

+

+class LLSLURL;

+

+class LLAgentUI

+{

+public:

+    enum ELocationFormat

+    {

+        LOCATION_FORMAT_NORMAL,         // Parcel

+        LOCATION_FORMAT_NORMAL_COORDS,  // Parcel (x, y, z)

+        LOCATION_FORMAT_LANDMARK,       // Parcel, Region

+        LOCATION_FORMAT_NO_MATURITY,    // Parcel, Region (x, y, z)

+        LOCATION_FORMAT_NO_COORDS,      // Parcel, Region - Maturity

+        LOCATION_FORMAT_FULL,           // Parcel, Region (x, y, z) - Maturity

+    };

+

+    static void buildFullname(std::string &name);

+

+    static void buildSLURL(LLSLURL& slurl, const bool escaped = true);

+    //build location string using the current position of gAgent.

+    static bool buildLocationString(std::string& str, ELocationFormat fmt = LOCATION_FORMAT_LANDMARK);

+    //build location string using a region position of the avatar.

+    static bool buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region);

+    /**

+     * @brief Check whether  the agent is in neighborhood of the pole  Within same region

+     * @return true if the agent is in neighborhood.

+     */

+    static bool checkAgentDistance(const LLVector3& local_pole, F32 radius);

+};

+

+#endif //LLAGENTUI_H