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

diff --git a/indra/llmessage/llservicebuilder.h b/indra/llmessage/llservicebuilder.h
index 968995edf2..be03534514 100644
--- a/indra/llmessage/llservicebuilder.h
+++ b/indra/llmessage/llservicebuilder.h
@@ -1,25 +1,25 @@
-/** 
+/**
 * @file llservicebuilder.h
 * @brief Declaration of the LLServiceBuilder class.
 *
 * $LicenseInfo:firstyear=2007&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$
 */
@@ -47,56 +47,56 @@ class LLSD;
  */
 std::string russ_format(const std::string& format_str, const LLSD& context);
 
-/** 
+/**
  * @class LLServiceBuilder
  * @brief This class builds urls for us to use when making web service calls.
  */
 class LLServiceBuilder
 {
-	LOG_CLASS(LLServiceBuilder);
+    LOG_CLASS(LLServiceBuilder);
 public:
-	LLServiceBuilder(void) {}
-	~LLServiceBuilder(void) {}
+    LLServiceBuilder(void) {}
+    ~LLServiceBuilder(void) {}
 
-	/** 
-	 * @brief Initialize this object with the service definitions.
-	 *
-	 * @param service_filename The services definition files -- services.xml.
-	 */
-	void loadServiceDefinitionsFromFile(const std::string& service_filename);
+    /**
+     * @brief Initialize this object with the service definitions.
+     *
+     * @param service_filename The services definition files -- services.xml.
+     */
+    void loadServiceDefinitionsFromFile(const std::string& service_filename);
 
-	/** 
-	 * @brief Build a service url if the url needs no construction parameters.
-	 *
-	 * @param service_name The name of the service you want to call.
-	 */
-	std::string buildServiceURI(const std::string& service_name) const;
+    /**
+     * @brief Build a service url if the url needs no construction parameters.
+     *
+     * @param service_name The name of the service you want to call.
+     */
+    std::string buildServiceURI(const std::string& service_name) const;
 
-	/** 
-	 * @brief Build a service url if the url with construction parameters.
-	 *
-	 * The parameter substitution supports string substituition from RUSS:
-	 * [[Recursive_URL_Substitution_Syntax]]
-	 * @param service_name The name of the service you want to call.
-	 * @param option_map The parameters in a map of name:value for the service.
-	 */
-	std::string buildServiceURI(
-		const std::string& service_name,
-		const LLSD& option_map) const;	
+    /**
+     * @brief Build a service url if the url with construction parameters.
+     *
+     * The parameter substitution supports string substituition from RUSS:
+     * [[Recursive_URL_Substitution_Syntax]]
+     * @param service_name The name of the service you want to call.
+     * @param option_map The parameters in a map of name:value for the service.
+     */
+    std::string buildServiceURI(
+        const std::string& service_name,
+        const LLSD& option_map) const;
 
 public:
-	/** 
-	 * @brief Helper method which builds construction state for a service
-	 *
-	 * This method should probably be protected, but we need to test this
-	 * method.
-	 */
-	void createServiceDefinition(
-		const std::string& service_name,
-		LLSD& service_url);
+    /**
+     * @brief Helper method which builds construction state for a service
+     *
+     * This method should probably be protected, but we need to test this
+     * method.
+     */
+    void createServiceDefinition(
+        const std::string& service_name,
+        LLSD& service_url);
 
 protected:
-	std::map<std::string, std::string> mServiceMap;
+    std::map<std::string, std::string> mServiceMap;
 };