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

diff --git a/indra/test/llpipeutil.cpp b/indra/test/llpipeutil.cpp
index bb706b58d5..c64cf21326 100644
--- a/indra/test/llpipeutil.cpp
+++ b/indra/test/llpipeutil.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llpipeutil.cpp
  * @date 2006-05-18
  * @brief Utility pipe fittings for injecting and extracting strings
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -41,33 +41,33 @@
 
 F32 pump_loop(LLPumpIO* pump, F32 seconds)
 {
-	LLTimer timer;
-	timer.setTimerExpirySec(seconds);
-	while(!timer.hasExpired())
-	{
-		LLFrameTimer::updateFrameTime();			
-		pump->pump();
-		pump->callback();
-	}
-	return timer.getElapsedTimeF32();
+    LLTimer timer;
+    timer.setTimerExpirySec(seconds);
+    while(!timer.hasExpired())
+    {
+        LLFrameTimer::updateFrameTime();
+        pump->pump();
+        pump->callback();
+    }
+    return timer.getElapsedTimeF32();
 }
 
-//virtual 
+//virtual
 LLIOPipe::EStatus LLPipeStringInjector::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)
 {
-	buffer->append(channels.out(), (U8*) mString.data(), mString.size());
-	eos = true;
-	return STATUS_DONE;
+    buffer->append(channels.out(), (U8*) mString.data(), mString.size());
+    eos = true;
+    return STATUS_DONE;
 }
 
 
 LLIOPipe::EStatus LLPipeStringExtractor::process_impl(
-	const LLChannelDescriptors& channels,
+    const LLChannelDescriptors& channels,
     buffer_ptr_t& buffer,
     bool& eos,
     LLSD& context,
@@ -76,108 +76,108 @@ LLIOPipe::EStatus LLPipeStringExtractor::process_impl(
     if(!eos) return STATUS_BREAK;
     if(!pump || !buffer) return STATUS_PRECONDITION_NOT_MET;
 
-	LLBufferStream istr(channels, buffer.get());
-	std::ostringstream ostr;
-	while (istr.good())
-	{
-		char buf[1024];		/* Flawfinder: ignore */
-		istr.read(buf, sizeof(buf));	/* Flawfinder: ignore */
-		ostr.write(buf, istr.gcount());
-	}
-	mString = ostr.str();
-	mDone = true;
-	
-	return STATUS_DONE;
+    LLBufferStream istr(channels, buffer.get());
+    std::ostringstream ostr;
+    while (istr.good())
+    {
+        char buf[1024];     /* Flawfinder: ignore */
+        istr.read(buf, sizeof(buf));    /* Flawfinder: ignore */
+        ostr.write(buf, istr.gcount());
+    }
+    mString = ostr.str();
+    mDone = true;
+
+    return STATUS_DONE;
 }
 
 
 // virtual
 LLIOPipe::EStatus LLIOFuzz::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)
 {
-	while(mByteCount)
-	{
-		std::vector<U8> data;
-		data.reserve(10000);
-		int size = llmin(10000, mByteCount);
-		std::generate_n(
-			std::back_insert_iterator< std::vector<U8> >(data),
-			size,
-			rand);
-		buffer->append(channels.out(), &data[0], size);
-		mByteCount -= size;
-	}
-	return STATUS_OK;
+    while(mByteCount)
+    {
+        std::vector<U8> data;
+        data.reserve(10000);
+        int size = llmin(10000, mByteCount);
+        std::generate_n(
+            std::back_insert_iterator< std::vector<U8> >(data),
+            size,
+            rand);
+        buffer->append(channels.out(), &data[0], size);
+        mByteCount -= size;
+    }
+    return STATUS_OK;
 }
 
 struct random_ascii_generator
 {
-	random_ascii_generator() {}
-	U8 operator()()
-	{
-		int rv = rand();
-		rv %= (127 - 32);
-		rv += 32;
-		return rv;
-	}
+    random_ascii_generator() {}
+    U8 operator()()
+    {
+        int rv = rand();
+        rv %= (127 - 32);
+        rv += 32;
+        return rv;
+    }
 };
 
 // virtual
 LLIOPipe::EStatus LLIOASCIIFuzz::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)
 {
-	while(mByteCount)
-	{
-		std::vector<U8> data;
-		data.reserve(10000);
-		int size = llmin(10000, mByteCount);
-		std::generate_n(
-			std::back_insert_iterator< std::vector<U8> >(data),
-			size,
-			random_ascii_generator());
-		buffer->append(channels.out(), &data[0], size);
-		mByteCount -= size;
-	}
-	return STATUS_OK;
+    while(mByteCount)
+    {
+        std::vector<U8> data;
+        data.reserve(10000);
+        int size = llmin(10000, mByteCount);
+        std::generate_n(
+            std::back_insert_iterator< std::vector<U8> >(data),
+            size,
+            random_ascii_generator());
+        buffer->append(channels.out(), &data[0], size);
+        mByteCount -= size;
+    }
+    return STATUS_OK;
 }
 
 // virtual
 LLIOPipe::EStatus LLIONull::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)
 {
-	return STATUS_OK;
+    return STATUS_OK;
 }
 
 // virtual
 LLIOPipe::EStatus LLIOSleeper::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)
 {
-	if(!mRespond)
-	{
-		LL_DEBUGS() << "LLIOSleeper::process_impl() sleeping." << LL_ENDL;
-		mRespond = true;
-		static const F64 SLEEP_TIME = 2.0;
-		pump->sleepChain(SLEEP_TIME);
-		return STATUS_BREAK;
-	}
-	LL_DEBUGS() << "LLIOSleeper::process_impl() responding." << LL_ENDL;
-	LLBufferStream ostr(channels, buffer.get());
-	ostr << "huh? sorry, I was sleeping." << std::endl;
-	return STATUS_DONE;
+    if(!mRespond)
+    {
+        LL_DEBUGS() << "LLIOSleeper::process_impl() sleeping." << LL_ENDL;
+        mRespond = true;
+        static const F64 SLEEP_TIME = 2.0;
+        pump->sleepChain(SLEEP_TIME);
+        return STATUS_BREAK;
+    }
+    LL_DEBUGS() << "LLIOSleeper::process_impl() responding." << LL_ENDL;
+    LLBufferStream ostr(channels, buffer.get());
+    ostr << "huh? sorry, I was sleeping." << std::endl;
+    return STATUS_DONE;
 }