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

diff --git a/indra/llmessage/lliopipe.cpp b/indra/llmessage/lliopipe.cpp
index 4676a9a8f0..75811bf3ce 100644
--- a/indra/llmessage/lliopipe.cpp
+++ b/indra/llmessage/lliopipe.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lliopipe.cpp
  * @author Phoenix
  * @date 2004-11-19
@@ -7,21 +7,21 @@
  * $LicenseInfo:firstyear=2004&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$
  */
@@ -33,32 +33,32 @@
 
 static const std::string STATUS_SUCCESS_NAMES[LLIOPipe::STATUS_SUCCESS_COUNT] =
 {
-	std::string("STATUS_OK"),
-	std::string("STATUS_STOP"),
-	std::string("STATUS_DONE"),
-	std::string("STATUS_BREAK"),
-	std::string("STATUS_NEED_PROCESS"),
+    std::string("STATUS_OK"),
+    std::string("STATUS_STOP"),
+    std::string("STATUS_DONE"),
+    std::string("STATUS_BREAK"),
+    std::string("STATUS_NEED_PROCESS"),
 };
 
 static const std::string STATUS_ERROR_NAMES[LLIOPipe::STATUS_ERROR_COUNT] =
 {
-	std::string("STATUS_ERROR"),
-	std::string("STATUS_NOT_IMPLEMENTED"),
-	std::string("STATUS_PRECONDITION_NOT_MET"),
-	std::string("STATUS_NO_CONNECTION"),
-	std::string("STATUS_LOST_CONNECTION"),
-	std::string("STATUS_EXPIRED"),
+    std::string("STATUS_ERROR"),
+    std::string("STATUS_NOT_IMPLEMENTED"),
+    std::string("STATUS_PRECONDITION_NOT_MET"),
+    std::string("STATUS_NO_CONNECTION"),
+    std::string("STATUS_LOST_CONNECTION"),
+    std::string("STATUS_EXPIRED"),
 };
 
 #ifdef LL_DEBUG_PUMPS
 // Debugging schmutz for deadlock
-const char	*gPumpFile = "";
-S32			gPumpLine = 0;
+const char  *gPumpFile = "";
+S32         gPumpLine = 0;
 
 void pump_debug(const char *file, S32 line)
 {
-	gPumpFile = file;
-	gPumpLine = line;
+    gPumpFile = file;
+    gPumpLine = line;
 }
 #endif /* LL_DEBUG_PUMPS */
 
@@ -66,55 +66,55 @@ void pump_debug(const char *file, S32 line)
  * LLIOPipe
  */
 LLIOPipe::LLIOPipe() :
-	mReferenceCount(0)
+    mReferenceCount(0)
 {
 }
 
 LLIOPipe::~LLIOPipe()
 {
-	//LL_DEBUGS() << "destroying LLIOPipe" << LL_ENDL;
+    //LL_DEBUGS() << "destroying LLIOPipe" << LL_ENDL;
 }
 
-//virtual 
-bool LLIOPipe::isValid() 
+//virtual
+bool LLIOPipe::isValid()
 {
-	return true ;
+    return true ;
 }
 
 // static
 std::string LLIOPipe::lookupStatusString(EStatus status)
 {
-	if((status >= 0) && (status < STATUS_SUCCESS_COUNT))
-	{
-		return STATUS_SUCCESS_NAMES[status];
-	}
-	else
-	{
-		S32 error_code = ((S32)status * -1) - 1;
-		if(error_code < STATUS_ERROR_COUNT)
-		{
-			return STATUS_ERROR_NAMES[error_code];
-		}
-	}
-	std::string rv;
-	return rv;
+    if((status >= 0) && (status < STATUS_SUCCESS_COUNT))
+    {
+        return STATUS_SUCCESS_NAMES[status];
+    }
+    else
+    {
+        S32 error_code = ((S32)status * -1) - 1;
+        if(error_code < STATUS_ERROR_COUNT)
+        {
+            return STATUS_ERROR_NAMES[error_code];
+        }
+    }
+    std::string rv;
+    return rv;
 }
 
 LLIOPipe::EStatus LLIOPipe::process(
-	const LLChannelDescriptors& channels,
-	buffer_ptr_t& buffer,
-	bool& eos,
-	LLSD& context,
-	LLPumpIO* pump)
+    const LLChannelDescriptors& channels,
+    buffer_ptr_t& buffer,
+    bool& eos,
+    LLSD& context,
+    LLPumpIO* pump)
 {
-	return process_impl(channels, buffer, eos, context, pump);
+    return process_impl(channels, buffer, eos, context, pump);
 }
 
 // virtual
 LLIOPipe::EStatus LLIOPipe::handleError(
-	LLIOPipe::EStatus status,
-	LLPumpIO* pump)
+    LLIOPipe::EStatus status,
+    LLPumpIO* pump)
 {
-	// by default, the error is not handled.
-	return status;
+    // by default, the error is not handled.
+    return status;
 }