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

diff --git a/indra/llmessage/llchainio.h b/indra/llmessage/llchainio.h
index 6e4d6c2013..3f12189214 100644
--- a/indra/llmessage/llchainio.h
+++ b/indra/llmessage/llchainio.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llchainio.h
  * @author Phoenix
  * @date 2005-08-04
@@ -7,21 +7,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$
  */
@@ -31,7 +31,7 @@
 
 #include "llpumpio.h"
 
-/** 
+/**
  * @class LLDeferredChain
  * @brief This class allows easy addition of a chain which will sleep
  * and then process another chain.
@@ -39,23 +39,23 @@
 class LLDeferredChain
 {
 public:
-	/**
-	 * @brief Add a chain to a pump in a finite # of seconds
-	 *
-	 * @prarm pump The pump to work on.
-	 * @prarm in_seconds The number of seconds from now when chain should start.
-	 * @prarm chain The chain to add in in_seconds seconds.
-	 * @prarm chain_timeout timeout for chain on the pump.
-	 * @return Returns true if the operation was queued.
-	 */
-	static bool addToPump(
-		LLPumpIO* pump,
-		F32 in_seconds,
-		const LLPumpIO::chain_t& chain,
-		F32 chain_timeout);
+    /**
+     * @brief Add a chain to a pump in a finite # of seconds
+     *
+     * @prarm pump The pump to work on.
+     * @prarm in_seconds The number of seconds from now when chain should start.
+     * @prarm chain The chain to add in in_seconds seconds.
+     * @prarm chain_timeout timeout for chain on the pump.
+     * @return Returns true if the operation was queued.
+     */
+    static bool addToPump(
+        LLPumpIO* pump,
+        F32 in_seconds,
+        const LLPumpIO::chain_t& chain,
+        F32 chain_timeout);
 };
 
-/** 
+/**
  * @class LLChainIOFactory
  * @brief This class is an abstract base class for building io chains.
  *
@@ -71,29 +71,29 @@ public:
 class LLChainIOFactory
 {
 public:
-	// Constructor
-	LLChainIOFactory();
+    // Constructor
+    LLChainIOFactory();
 
-	// Destructor
-	virtual ~LLChainIOFactory();
+    // Destructor
+    virtual ~LLChainIOFactory();
 
-	/** 
-	 * @brief Build the chian with in as the first and end as the last
-	 *
-	 * The caller of the LLChainIOFactory is responsible for managing
-	 * the memory of the in pipe. All of the chains generated by the
-	 * factory will be ref counted as usual, so the caller will also
-	 * need to break the links in the chain.
-	 * @param chain The chain which will have new pipes appended
-	 * @param context A context for use by this factory if you choose
-	 * @retrun Returns true if the call was successful.
-	 */
-	virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const = 0;
+    /**
+     * @brief Build the chian with in as the first and end as the last
+     *
+     * The caller of the LLChainIOFactory is responsible for managing
+     * the memory of the in pipe. All of the chains generated by the
+     * factory will be ref counted as usual, so the caller will also
+     * need to break the links in the chain.
+     * @param chain The chain which will have new pipes appended
+     * @param context A context for use by this factory if you choose
+     * @retrun Returns true if the call was successful.
+     */
+    virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const = 0;
 
 protected:
 };
 
-/** 
+/**
  * @class LLSimpleIOFactory
  * @brief Basic implementation for making a factory that returns a
  * 'chain' of one object
@@ -102,14 +102,14 @@ template<class Pipe>
 class LLSimpleIOFactory : 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;
+    }
 };
 
-/** 
+/**
  * @class LLCloneIOFactory
  * @brief Implementation for a facory which copies a particular pipe.
  */
@@ -117,19 +117,19 @@ template<class Pipe>
 class LLCloneIOFactory : public LLChainIOFactory
 {
 public:
-	LLCloneIOFactory(Pipe* original) :
-		mHandle(original),
-		mOriginal(original) {}
+    LLCloneIOFactory(Pipe* original) :
+        mHandle(original),
+        mOriginal(original) {}
 
-	virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const
-	{
-		chain.push_back(LLIOPipe::ptr_t(new Pipe(*mOriginal)));
-		return true;
-	}
+    virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const
+    {
+        chain.push_back(LLIOPipe::ptr_t(new Pipe(*mOriginal)));
+        return true;
+    }
 
 protected:
-	LLIOPipe::ptr_t mHandle;
-	Pipe* mOriginal;
+    LLIOPipe::ptr_t mHandle;
+    Pipe* mOriginal;
 };
 
 #endif // LL_LLCHAINIO_H