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

diff --git a/indra/llprimitive/llmaterialid.cpp b/indra/llprimitive/llmaterialid.cpp
index 340a83801c..847824d770 100644
--- a/indra/llprimitive/llmaterialid.cpp
+++ b/indra/llprimitive/llmaterialid.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file llmaterialid.cpp
 * @brief Implementation of llmaterialid
 * @author Stinson@lindenlab.com
@@ -37,33 +37,33 @@ const LLMaterialID LLMaterialID::null;
 
 LLMaterialID::LLMaterialID()
 {
-	clear();
+    clear();
 }
 
 LLMaterialID::LLMaterialID(const LLSD& pMaterialID)
 {
-	llassert(pMaterialID.isBinary());
-	parseFromBinary(pMaterialID.asBinary());
+    llassert(pMaterialID.isBinary());
+    parseFromBinary(pMaterialID.asBinary());
 }
 
 LLMaterialID::LLMaterialID(const LLSD::Binary& pMaterialID)
 {
-	parseFromBinary(pMaterialID);
+    parseFromBinary(pMaterialID);
 }
 
 LLMaterialID::LLMaterialID(const void* pMemory)
 {
-	set(pMemory);
+    set(pMemory);
 }
 
 LLMaterialID::LLMaterialID(const LLMaterialID& pOtherMaterialID)
 {
-	copyFromOtherMaterialID(pOtherMaterialID);
+    copyFromOtherMaterialID(pOtherMaterialID);
 }
 
 LLMaterialID::LLMaterialID(const LLUUID& lluid)
 {
-	set(lluid.mData);
+    set(lluid.mData);
 }
 
 LLMaterialID::~LLMaterialID()
@@ -72,87 +72,87 @@ LLMaterialID::~LLMaterialID()
 
 bool LLMaterialID::operator == (const LLMaterialID& pOtherMaterialID) const
 {
-	return (compareToOtherMaterialID(pOtherMaterialID) == 0);
+    return (compareToOtherMaterialID(pOtherMaterialID) == 0);
 }
 
 bool LLMaterialID::operator != (const LLMaterialID& pOtherMaterialID) const
 {
-	return (compareToOtherMaterialID(pOtherMaterialID) != 0);
+    return (compareToOtherMaterialID(pOtherMaterialID) != 0);
 }
 
 bool LLMaterialID::operator < (const LLMaterialID& pOtherMaterialID) const
 {
-	return (compareToOtherMaterialID(pOtherMaterialID) < 0);
+    return (compareToOtherMaterialID(pOtherMaterialID) < 0);
 }
 
 bool LLMaterialID::operator <= (const LLMaterialID& pOtherMaterialID) const
 {
-	return (compareToOtherMaterialID(pOtherMaterialID) <= 0);
+    return (compareToOtherMaterialID(pOtherMaterialID) <= 0);
 }
 
 bool LLMaterialID::operator > (const LLMaterialID& pOtherMaterialID) const
 {
-	return (compareToOtherMaterialID(pOtherMaterialID) > 0);
+    return (compareToOtherMaterialID(pOtherMaterialID) > 0);
 }
 
 bool LLMaterialID::operator >= (const LLMaterialID& pOtherMaterialID) const
 {
-	return (compareToOtherMaterialID(pOtherMaterialID) >= 0);
+    return (compareToOtherMaterialID(pOtherMaterialID) >= 0);
 }
 
 LLMaterialID& LLMaterialID::operator = (const LLMaterialID& pOtherMaterialID)
 {
-	copyFromOtherMaterialID(pOtherMaterialID);
-	return (*this);
+    copyFromOtherMaterialID(pOtherMaterialID);
+    return (*this);
 }
 
 bool LLMaterialID::isNull() const
 {
-	return (compareToOtherMaterialID(LLMaterialID::null) == 0);
+    return (compareToOtherMaterialID(LLMaterialID::null) == 0);
 }
 
 const U8* LLMaterialID::get() const
 {
-	return mID;
+    return mID;
 }
 
 void LLMaterialID::set(const void* pMemory)
 {
-	llassert(pMemory != NULL);
+    llassert(pMemory != NULL);
 
-	// assumes that the required size of memory is available
-	memcpy(mID, pMemory, MATERIAL_ID_SIZE * sizeof(U8));
+    // assumes that the required size of memory is available
+    memcpy(mID, pMemory, MATERIAL_ID_SIZE * sizeof(U8));
 }
 
 void LLMaterialID::clear()
 {
-	memset(mID, 0, MATERIAL_ID_SIZE * sizeof(U8));
+    memset(mID, 0, MATERIAL_ID_SIZE * sizeof(U8));
 }
 
 LLSD LLMaterialID::asLLSD() const
 {
-	LLSD::Binary materialIDBinary;
+    LLSD::Binary materialIDBinary;
 
-	materialIDBinary.resize(MATERIAL_ID_SIZE * sizeof(U8));
-	memcpy(materialIDBinary.data(), mID, MATERIAL_ID_SIZE * sizeof(U8));
+    materialIDBinary.resize(MATERIAL_ID_SIZE * sizeof(U8));
+    memcpy(materialIDBinary.data(), mID, MATERIAL_ID_SIZE * sizeof(U8));
 
-	LLSD materialID = materialIDBinary;
-	return materialID;
+    LLSD materialID = materialIDBinary;
+    return materialID;
 }
 
 std::string LLMaterialID::asString() const
 {
-	std::string materialIDString;
-	for (unsigned int i = 0U; i < static_cast<unsigned int>(MATERIAL_ID_SIZE / sizeof(U32)); ++i)
-	{
-		if (i != 0U)
-		{
-			materialIDString += "-";
-		}
-		const U32 *value = reinterpret_cast<const U32*>(&get()[i * sizeof(U32)]);
-		materialIDString += llformat("%08x", *value);
-	}
-	return materialIDString;
+    std::string materialIDString;
+    for (unsigned int i = 0U; i < static_cast<unsigned int>(MATERIAL_ID_SIZE / sizeof(U32)); ++i)
+    {
+        if (i != 0U)
+        {
+            materialIDString += "-";
+        }
+        const U32 *value = reinterpret_cast<const U32*>(&get()[i * sizeof(U32)]);
+        materialIDString += llformat("%08x", *value);
+    }
+    return materialIDString;
 }
 
 LLUUID LLMaterialID::asUUID() const
@@ -164,32 +164,32 @@ LLUUID LLMaterialID::asUUID() const
 
 std::ostream& operator<<(std::ostream& s, const LLMaterialID &material_id)
 {
-	s << material_id.asString();
-	return s;
+    s << material_id.asString();
+    return s;
 }
 
 
 void LLMaterialID::parseFromBinary (const LLSD::Binary& pMaterialID)
 {
-	llassert(pMaterialID.size() == (MATERIAL_ID_SIZE * sizeof(U8)));
-	memcpy(mID, &pMaterialID[0], MATERIAL_ID_SIZE * sizeof(U8));
+    llassert(pMaterialID.size() == (MATERIAL_ID_SIZE * sizeof(U8)));
+    memcpy(mID, &pMaterialID[0], MATERIAL_ID_SIZE * sizeof(U8));
 }
 
 void LLMaterialID::copyFromOtherMaterialID(const LLMaterialID& pOtherMaterialID)
 {
-	memcpy(mID, pOtherMaterialID.get(), MATERIAL_ID_SIZE * sizeof(U8));
+    memcpy(mID, pOtherMaterialID.get(), MATERIAL_ID_SIZE * sizeof(U8));
 }
 
 int LLMaterialID::compareToOtherMaterialID(const LLMaterialID& pOtherMaterialID) const
 {
-	int retVal = 0;
+    int retVal = 0;
 
-	for (unsigned int i = 0U; (retVal == 0) && (i < static_cast<unsigned int>(MATERIAL_ID_SIZE / sizeof(U32))); ++i)
-	{
-		const U32 *thisValue = reinterpret_cast<const U32*>(&get()[i * sizeof(U32)]);
-		const U32 *otherValue = reinterpret_cast<const U32*>(&pOtherMaterialID.get()[i * sizeof(U32)]);
-		retVal = ((*thisValue < *otherValue) ? -1 : ((*thisValue > *otherValue) ? 1 : 0));
-	}
+    for (unsigned int i = 0U; (retVal == 0) && (i < static_cast<unsigned int>(MATERIAL_ID_SIZE / sizeof(U32))); ++i)
+    {
+        const U32 *thisValue = reinterpret_cast<const U32*>(&get()[i * sizeof(U32)]);
+        const U32 *otherValue = reinterpret_cast<const U32*>(&pOtherMaterialID.get()[i * sizeof(U32)]);
+        retVal = ((*thisValue < *otherValue) ? -1 : ((*thisValue > *otherValue) ? 1 : 0));
+    }
 
-	return retVal;
+    return retVal;
 }