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/lliobuffer.cpp b/indra/llmessage/lliobuffer.cpp
index bbd7b8777d..4f5821b15f 100644
--- a/indra/llmessage/lliobuffer.cpp
+++ b/indra/llmessage/lliobuffer.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file lliobuffer.cpp
  * @author Phoenix
  * @date 2005-05-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$
  */
@@ -33,82 +33,82 @@
 // LLIOBuffer
 //
 LLIOBuffer::LLIOBuffer() :
-	mBuffer(NULL),
-	mBufferSize(0L),
-	mReadHead(NULL),
-	mWriteHead(NULL)
+    mBuffer(NULL),
+    mBufferSize(0L),
+    mReadHead(NULL),
+    mWriteHead(NULL)
 {
 }
 
 LLIOBuffer::~LLIOBuffer()
 {
-	if(mBuffer)
-	{
-		delete[] mBuffer;
-	}
+    if(mBuffer)
+    {
+        delete[] mBuffer;
+    }
 }
 
 U8* LLIOBuffer::data() const
 {
-	return mBuffer;
+    return mBuffer;
 }
 
 S64 LLIOBuffer::size() const
 {
-	return mBufferSize;
+    return mBufferSize;
 }
 
 U8* LLIOBuffer::current() const
 {
-	return mReadHead;
+    return mReadHead;
 }
 
 S64 LLIOBuffer::bytesLeft() const
 {
-	return mWriteHead - mReadHead;
+    return mWriteHead - mReadHead;
 }
 
 void LLIOBuffer::clear()
 {
-	mReadHead = mBuffer;
-	mWriteHead = mBuffer;
+    mReadHead = mBuffer;
+    mWriteHead = mBuffer;
 }
 
 LLIOPipe::EStatus LLIOBuffer::seek(LLIOBuffer::EHead head, S64 delta)
 {
-	LLIOPipe::EStatus status = STATUS_ERROR;
-	switch(head)
-	{
-	case READ:
-		if(((delta >= 0) && ((mReadHead + delta) <= mWriteHead))
-		   || ((delta < 0) && ((mReadHead + delta) >= mBuffer)))
-		{
-			mReadHead += delta;
-			status = STATUS_OK;
-		}
-		break;
-	case WRITE:
-		if(((delta >= 0) && ((mWriteHead + delta) < (mBuffer + mBufferSize)))
-		   || ((delta < 0) && ((mWriteHead + delta) > mReadHead)))
-		{
-			mWriteHead += delta;
-			status = STATUS_OK;
-		}
-	default:
-		break;
-	}
-	return status;
+    LLIOPipe::EStatus status = STATUS_ERROR;
+    switch(head)
+    {
+    case READ:
+        if(((delta >= 0) && ((mReadHead + delta) <= mWriteHead))
+           || ((delta < 0) && ((mReadHead + delta) >= mBuffer)))
+        {
+            mReadHead += delta;
+            status = STATUS_OK;
+        }
+        break;
+    case WRITE:
+        if(((delta >= 0) && ((mWriteHead + delta) < (mBuffer + mBufferSize)))
+           || ((delta < 0) && ((mWriteHead + delta) > mReadHead)))
+        {
+            mWriteHead += delta;
+            status = STATUS_OK;
+        }
+    default:
+        break;
+    }
+    return status;
 }
 
 // virtual
 LLIOPipe::EStatus LLIOBuffer::process_impl(
-	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)
 {
-	// no-op (I think)
-	LL_WARNS() << "You are using an LLIOBuffer which is deprecated." << LL_ENDL;
-	return STATUS_OK;
+    // no-op (I think)
+    LL_WARNS() << "You are using an LLIOBuffer which is deprecated." << LL_ENDL;
+    return STATUS_OK;
 }