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

diff --git a/indra/llmessage/lliohttpserver.h b/indra/llmessage/lliohttpserver.h
index a23eafe58a..a1ae8736b7 100644
--- a/indra/llmessage/lliohttpserver.h
+++ b/indra/llmessage/lliohttpserver.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lliohttpserver.h
  * @brief Declaration of function for creating an HTTP wire server
  * @see LLIOServerSocket, LLPumpIO
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2005&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$
  */
@@ -36,38 +36,38 @@ class LLPumpIO;
 class LLIOHTTPServer
 {
 public:
-	typedef void (*timing_callback_t)(const char* hashed_name, F32 time, void* data);
-
-	static LLHTTPNode& create(apr_pool_t* pool, LLPumpIO& pump, U16 port);
-	/**< Creates an HTTP wire server on the pump for the given TCP port.
-	 *
-	 *   Returns the root node of the new server.  Add LLHTTPNode instances
-	 *   to this root.
-	 *
-	 *   Nodes that return NULL for getProtocolHandler(), will use the
-	 *   default handler that interprets HTTP on the wire and converts
-	 *   it into calls to get(), put(), post(), del() with appropriate
-	 *   LLSD arguments and results.
-	 *
-	 *   To have nodes that implement some other wire protocol (XML-RPC
-	 *   for example), use the helper templates below.
-	 */
- 
-	static void createPipe(LLPumpIO::chain_t& chain, 
+    typedef void (*timing_callback_t)(const char* hashed_name, F32 time, void* data);
+
+    static LLHTTPNode& create(apr_pool_t* pool, LLPumpIO& pump, U16 port);
+    /**< Creates an HTTP wire server on the pump for the given TCP port.
+     *
+     *   Returns the root node of the new server.  Add LLHTTPNode instances
+     *   to this root.
+     *
+     *   Nodes that return NULL for getProtocolHandler(), will use the
+     *   default handler that interprets HTTP on the wire and converts
+     *   it into calls to get(), put(), post(), del() with appropriate
+     *   LLSD arguments and results.
+     *
+     *   To have nodes that implement some other wire protocol (XML-RPC
+     *   for example), use the helper templates below.
+     */
+
+    static void createPipe(LLPumpIO::chain_t& chain,
             const LLHTTPNode& root, const LLSD& ctx);
-	/**< Create a pipe on the chain that handles HTTP requests.
-	 *   The requests are served by the node tree given at root.
-	 *
-	 *   This is primarily useful for unit testing.
-	 */
-
-	static void setTimingCallback(timing_callback_t callback, void* data);
-	/**< Register a callback function that will be called every time
-	*    a GET, PUT, POST, or DELETE is handled.
-	*
-	* This is used to time the LLHTTPNode handler code, which often hits
-	* the database or does other, slow operations. JC
-	*/
+    /**< Create a pipe on the chain that handles HTTP requests.
+     *   The requests are served by the node tree given at root.
+     *
+     *   This is primarily useful for unit testing.
+     */
+
+    static void setTimingCallback(timing_callback_t callback, void* data);
+    /**< Register a callback function that will be called every time
+    *    a GET, PUT, POST, or DELETE is handled.
+    *
+    * This is used to time the LLHTTPNode handler code, which often hits
+    * the database or does other, slow operations. JC
+    */
 };
 
 /* @name Helper Templates
@@ -80,14 +80,14 @@ public:
  *
  * The templates are:
  *
- * 	LLChainIOFactoryForPipe
- * 		- a simple factory that builds instances of a pipe
+ *  LLChainIOFactoryForPipe
+ *      - a simple factory that builds instances of a pipe
  *
- * 	LLHTTPNodeForFacotry
- * 		- a HTTP node that uses a factory as the protocol handler
+ *  LLHTTPNodeForFacotry
+ *      - a HTTP node that uses a factory as the protocol handler
  *
- * 	LLHTTPNodeForPipe
- * 		- a HTTP node that uses a simple factory based on a pipe
+ *  LLHTTPNodeForPipe
+ *      - a HTTP node that uses a simple factory based on a pipe
  */
 //@{
 
@@ -95,22 +95,22 @@ template<class Pipe>
 class LLChainIOFactoryForPipe : public LLChainIOFactory
 {
 public:
-	virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const
-	{   
-		chain.push_back(LLIOPipe::ptr_t(new Pipe));
-		return true;
-	}
+    virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const
+    {
+        chain.push_back(LLIOPipe::ptr_t(new Pipe));
+        return true;
+    }
 };
 
 template<class Factory>
 class LLHTTPNodeForFactory : public LLHTTPNode
 {
 public:
-	const LLChainIOFactory* getProtocolHandler() const
-		{ return &mProtocolHandler; }
+    const LLChainIOFactory* getProtocolHandler() const
+        { return &mProtocolHandler; }
 
 private:
-	Factory mProtocolHandler;
+    Factory mProtocolHandler;
 };
 
 //@}
@@ -118,7 +118,7 @@ private:
 
 template<class Pipe>
 class LLHTTPNodeForPipe : public LLHTTPNodeForFactory<
-						  			LLChainIOFactoryForPipe<Pipe> >
+                                    LLChainIOFactoryForPipe<Pipe> >
 {
 };