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

diff --git a/indra/llmessage/lltransfertargetfile.cpp b/indra/llmessage/lltransfertargetfile.cpp
index ca0318a2d6..6d8b69fa6f 100644
--- a/indra/llmessage/lltransfertargetfile.cpp
+++ b/indra/llmessage/lltransfertargetfile.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltransfertargetfile.cpp
  * @brief Transfer system for receiving a file.
  *
  * $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$
  */
@@ -33,99 +33,99 @@
 
 
 LLTransferTargetFile::LLTransferTargetFile(
-	const LLUUID& uuid,
-	LLTransferSourceType src_type) :
-	LLTransferTarget(LLTTT_FILE, uuid, src_type),
-	mFP(NULL)
+    const LLUUID& uuid,
+    LLTransferSourceType src_type) :
+    LLTransferTarget(LLTTT_FILE, uuid, src_type),
+    mFP(NULL)
 {
 }
 
 LLTransferTargetFile::~LLTransferTargetFile()
 {
-	if (mFP)
-	{
-		LL_ERRS() << "LLTransferTargetFile::~LLTransferTargetFile - Should have been cleaned up in completion callback" << LL_ENDL;
-		fclose(mFP);
-		mFP = NULL;
-	}
+    if (mFP)
+    {
+        LL_ERRS() << "LLTransferTargetFile::~LLTransferTargetFile - Should have been cleaned up in completion callback" << LL_ENDL;
+        fclose(mFP);
+        mFP = NULL;
+    }
 }
 
 // virtual
 bool LLTransferTargetFile::unpackParams(LLDataPacker& dp)
 {
-	// we can safely ignore this call
-	return true;
+    // we can safely ignore this call
+    return true;
 }
 
 void LLTransferTargetFile::applyParams(const LLTransferTargetParams &params)
 {
-	if (params.getType() != mType)
-	{
-		LL_WARNS() << "Target parameter type doesn't match!" << LL_ENDL;
-		return;
-	}
-	
-	mParams = (LLTransferTargetParamsFile &)params;
+    if (params.getType() != mType)
+    {
+        LL_WARNS() << "Target parameter type doesn't match!" << LL_ENDL;
+        return;
+    }
+
+    mParams = (LLTransferTargetParamsFile &)params;
 }
 
 LLTSCode LLTransferTargetFile::dataCallback(const S32 packet_id, U8 *in_datap, const S32 in_size)
 {
-	//LL_INFOS() << "LLTransferTargetFile::dataCallback" << LL_ENDL;
-	//LL_INFOS() << "Packet: " << packet_id << LL_ENDL;
-
-	if (!mFP)
-	{
-		mFP = LLFile::fopen(mParams.mFilename, "wb");		/* Flawfinder: ignore */		
-
-		if (!mFP)
-		{
-			LL_WARNS() << "Failure opening " << mParams.mFilename << " for write by LLTransferTargetFile" << LL_ENDL;
-			return LLTS_ERROR;
-		}
-	}
-	if (!in_size)
-	{
-		return LLTS_OK;
-	}
-
-	S32 count = (S32)fwrite(in_datap, 1, in_size, mFP);
-	if (count != in_size)
-	{
-		LL_WARNS() << "Failure in LLTransferTargetFile::dataCallback!" << LL_ENDL;
-		return LLTS_ERROR;
-	}
-	return LLTS_OK;
+    //LL_INFOS() << "LLTransferTargetFile::dataCallback" << LL_ENDL;
+    //LL_INFOS() << "Packet: " << packet_id << LL_ENDL;
+
+    if (!mFP)
+    {
+        mFP = LLFile::fopen(mParams.mFilename, "wb");       /* Flawfinder: ignore */
+
+        if (!mFP)
+        {
+            LL_WARNS() << "Failure opening " << mParams.mFilename << " for write by LLTransferTargetFile" << LL_ENDL;
+            return LLTS_ERROR;
+        }
+    }
+    if (!in_size)
+    {
+        return LLTS_OK;
+    }
+
+    S32 count = (S32)fwrite(in_datap, 1, in_size, mFP);
+    if (count != in_size)
+    {
+        LL_WARNS() << "Failure in LLTransferTargetFile::dataCallback!" << LL_ENDL;
+        return LLTS_ERROR;
+    }
+    return LLTS_OK;
 }
 
 void LLTransferTargetFile::completionCallback(const LLTSCode status)
 {
-	LL_INFOS() << "LLTransferTargetFile::completionCallback" << LL_ENDL;
-	if (mFP)
-	{
-		fclose(mFP);
-	}
-
-	// Still need to gracefully handle error conditions.
-	switch (status)
-	{
-	case LLTS_DONE:
-		break;
-	case LLTS_ABORT:
-	case LLTS_ERROR:
-		// We're aborting this transfer, we don't want to keep this file.
-		LL_WARNS() << "Aborting file transfer for " << mParams.mFilename << LL_ENDL;
-		if (mFP)
-		{
-			// Only need to remove file if we successfully opened it.
-			LLFile::remove(mParams.mFilename);
-		}
-	default:
-		break;
-	}
-
-	mFP = NULL;
-	if (mParams.mCompleteCallback)
-	{
-		mParams.mCompleteCallback(status, mParams.mUserData);
-	}
+    LL_INFOS() << "LLTransferTargetFile::completionCallback" << LL_ENDL;
+    if (mFP)
+    {
+        fclose(mFP);
+    }
+
+    // Still need to gracefully handle error conditions.
+    switch (status)
+    {
+    case LLTS_DONE:
+        break;
+    case LLTS_ABORT:
+    case LLTS_ERROR:
+        // We're aborting this transfer, we don't want to keep this file.
+        LL_WARNS() << "Aborting file transfer for " << mParams.mFilename << LL_ENDL;
+        if (mFP)
+        {
+            // Only need to remove file if we successfully opened it.
+            LLFile::remove(mParams.mFilename);
+        }
+    default:
+        break;
+    }
+
+    mFP = NULL;
+    if (mParams.mCompleteCallback)
+    {
+        mParams.mCompleteCallback(status, mParams.mUserData);
+    }
 }