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

diff --git a/indra/llmessage/llchainio.cpp b/indra/llmessage/llchainio.cpp
index bcda6746a1..78dff246cb 100644
--- a/indra/llmessage/llchainio.cpp
+++ b/indra/llmessage/llchainio.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llchainio.cpp
  * @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$
  */
@@ -38,20 +38,20 @@
  */
 // static
 bool LLDeferredChain::addToPump(
-	LLPumpIO* pump,
-	F32 in_seconds,
-	const LLPumpIO::chain_t& deferred_chain,
-	F32 chain_timeout)
+    LLPumpIO* pump,
+    F32 in_seconds,
+    const LLPumpIO::chain_t& deferred_chain,
+    F32 chain_timeout)
 {
-	if(!pump) return false;
-	LLPumpIO::chain_t sleep_chain;
-	sleep_chain.push_back(LLIOPipe::ptr_t(new LLIOSleep(in_seconds)));
-	sleep_chain.push_back(
-		LLIOPipe::ptr_t(new LLIOAddChain(deferred_chain, chain_timeout)));
+    if(!pump) return false;
+    LLPumpIO::chain_t sleep_chain;
+    sleep_chain.push_back(LLIOPipe::ptr_t(new LLIOSleep(in_seconds)));
+    sleep_chain.push_back(
+        LLIOPipe::ptr_t(new LLIOAddChain(deferred_chain, chain_timeout)));
 
-	// give it a litle bit of padding.
-	pump->addChain(sleep_chain, in_seconds + 10.0f);
-	return true;
+    // give it a litle bit of padding.
+    pump->addChain(sleep_chain, in_seconds + 10.0f);
+    return true;
 }
 
 /**
@@ -69,20 +69,20 @@ LLChainIOFactory::~LLChainIOFactory()
 #if 0
 bool LLChainIOFactory::build(LLIOPipe* in, LLIOPipe* out) const
 {
-	if(!in || !out)
-	{
-		return false;
-	}
-	LLIOPipe* first = NULL;
-	LLIOPipe* last = NULL;
-	if(build_impl(first, last) && first && last)
-	{
-		in->connect(first);
-		last->connect(out);
-		return true;
-	}
-	LLIOPipe::ptr_t foo(first);
-	LLIOPipe::ptr_t bar(last);
-	return false;
+    if(!in || !out)
+    {
+        return false;
+    }
+    LLIOPipe* first = NULL;
+    LLIOPipe* last = NULL;
+    if(build_impl(first, last) && first && last)
+    {
+        in->connect(first);
+        last->connect(out);
+        return true;
+    }
+    LLIOPipe::ptr_t foo(first);
+    LLIOPipe::ptr_t bar(last);
+    return false;
 }
 #endif