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

diff --git a/indra/newview/llpathfindingnavmesh.cpp b/indra/newview/llpathfindingnavmesh.cpp
index c297cac771..52a7383da6 100644
--- a/indra/newview/llpathfindingnavmesh.cpp
+++ b/indra/newview/llpathfindingnavmesh.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file llpathfindingnavmesh.cpp
 * @brief Implementation of llpathfindingnavmesh
 * @author Stinson@lindenlab.com
@@ -45,10 +45,10 @@
 //---------------------------------------------------------------------------
 
 LLPathfindingNavMesh::LLPathfindingNavMesh(const LLUUID &pRegionUUID)
-	: mNavMeshStatus(pRegionUUID),
-	mNavMeshRequestStatus(kNavMeshRequestUnknown),
-	mNavMeshSignal(),
-	mNavMeshData()
+    : mNavMeshStatus(pRegionUUID),
+    mNavMeshRequestStatus(kNavMeshRequestUnknown),
+    mNavMeshSignal(),
+    mNavMeshData()
 
 {
 }
@@ -59,146 +59,146 @@ LLPathfindingNavMesh::~LLPathfindingNavMesh()
 
 LLPathfindingNavMesh::navmesh_slot_t LLPathfindingNavMesh::registerNavMeshListener(navmesh_callback_t pNavMeshCallback)
 {
-	return mNavMeshSignal.connect(pNavMeshCallback);
+    return mNavMeshSignal.connect(pNavMeshCallback);
 }
 
 bool LLPathfindingNavMesh::hasNavMeshVersion(const LLPathfindingNavMeshStatus &pNavMeshStatus) const
 {
-	return ((mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion()) &&
-		((mNavMeshRequestStatus == kNavMeshRequestStarted) || (mNavMeshRequestStatus == kNavMeshRequestCompleted) ||
-		((mNavMeshRequestStatus == kNavMeshRequestChecking) && !mNavMeshData.empty())));
+    return ((mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion()) &&
+        ((mNavMeshRequestStatus == kNavMeshRequestStarted) || (mNavMeshRequestStatus == kNavMeshRequestCompleted) ||
+        ((mNavMeshRequestStatus == kNavMeshRequestChecking) && !mNavMeshData.empty())));
 }
 
 void LLPathfindingNavMesh::handleNavMeshWaitForRegionLoad()
 {
-	setRequestStatus(kNavMeshRequestWaiting);
+    setRequestStatus(kNavMeshRequestWaiting);
 }
 
 void LLPathfindingNavMesh::handleNavMeshCheckVersion()
 {
-	setRequestStatus(kNavMeshRequestChecking);
+    setRequestStatus(kNavMeshRequestChecking);
 }
 
 void LLPathfindingNavMesh::handleRefresh(const LLPathfindingNavMeshStatus &pNavMeshStatus)
 {
-	llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
-	llassert(mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion());
-	mNavMeshStatus = pNavMeshStatus;
-	if (mNavMeshRequestStatus == kNavMeshRequestChecking)
-	{
-		llassert(!mNavMeshData.empty());
-		setRequestStatus(kNavMeshRequestCompleted);
-	}
-	else
-	{
-		sendStatus();
-	}
+    llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
+    llassert(mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion());
+    mNavMeshStatus = pNavMeshStatus;
+    if (mNavMeshRequestStatus == kNavMeshRequestChecking)
+    {
+        llassert(!mNavMeshData.empty());
+        setRequestStatus(kNavMeshRequestCompleted);
+    }
+    else
+    {
+        sendStatus();
+    }
 }
 
 void LLPathfindingNavMesh::handleNavMeshNewVersion(const LLPathfindingNavMeshStatus &pNavMeshStatus)
 {
-	llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
-	if (mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion())
-	{
-		mNavMeshStatus = pNavMeshStatus;
-		sendStatus();
-	}
-	else
-	{
-		mNavMeshData.clear();
-		mNavMeshStatus = pNavMeshStatus;
-		setRequestStatus(kNavMeshRequestNeedsUpdate);
-	}
+    llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
+    if (mNavMeshStatus.getVersion() == pNavMeshStatus.getVersion())
+    {
+        mNavMeshStatus = pNavMeshStatus;
+        sendStatus();
+    }
+    else
+    {
+        mNavMeshData.clear();
+        mNavMeshStatus = pNavMeshStatus;
+        setRequestStatus(kNavMeshRequestNeedsUpdate);
+    }
 }
 
 void LLPathfindingNavMesh::handleNavMeshStart(const LLPathfindingNavMeshStatus &pNavMeshStatus)
 {
-	llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
-	mNavMeshStatus = pNavMeshStatus;
-	setRequestStatus(kNavMeshRequestStarted);
+    llassert(mNavMeshStatus.getRegionUUID() == pNavMeshStatus.getRegionUUID());
+    mNavMeshStatus = pNavMeshStatus;
+    setRequestStatus(kNavMeshRequestStarted);
 }
 
 void LLPathfindingNavMesh::handleNavMeshResult(const LLSD &pContent, U32 pNavMeshVersion)
 {
-	llassert(pContent.has(NAVMESH_VERSION_FIELD));
-	if (pContent.has(NAVMESH_VERSION_FIELD))
-	{
-		llassert(pContent.get(NAVMESH_VERSION_FIELD).isInteger());
-		llassert(pContent.get(NAVMESH_VERSION_FIELD).asInteger() >= 0);
-		U32 embeddedNavMeshVersion = static_cast<U32>(pContent.get(NAVMESH_VERSION_FIELD).asInteger());
-		llassert(embeddedNavMeshVersion == pNavMeshVersion); // stinson 03/13/2012 : does this ever occur?
-		if (embeddedNavMeshVersion != pNavMeshVersion)
-		{
-			LL_WARNS() << "Mismatch between expected and embedded navmesh versions occurred" << LL_ENDL;
-			pNavMeshVersion = embeddedNavMeshVersion;
-		}
-	}
-
-	if (mNavMeshStatus.getVersion() == pNavMeshVersion)
-	{
-		ENavMeshRequestStatus status;
-		if ( pContent.has(NAVMESH_DATA_FIELD) )
-		{
-			const LLSD::Binary &value = pContent.get(NAVMESH_DATA_FIELD).asBinary();
-			unsigned int binSize = value.size();
-			std::string newStr(reinterpret_cast<const char *>(&value[0]), binSize);
-			std::istringstream streamdecomp( newStr );
-			size_t decompBinSize = 0;
-			bool valid = false;
-			U8* pUncompressedNavMeshContainer = unzip_llsdNavMesh( valid, decompBinSize, streamdecomp, binSize ) ;
-			if ( !valid )
-			{
-				LL_WARNS() << "Unable to decompress the navmesh llsd." << LL_ENDL;
-				status = kNavMeshRequestError;
-			}
-			else
-			{
-				llassert(pUncompressedNavMeshContainer);
-				mNavMeshData.resize( decompBinSize );
-				memcpy( &mNavMeshData[0], &pUncompressedNavMeshContainer[0], decompBinSize );
-				status = kNavMeshRequestCompleted;
-			}
-			if ( pUncompressedNavMeshContainer )
-			{
-				free( pUncompressedNavMeshContainer );
-			}
-		}
-		else
-		{
-			LL_WARNS() << "No mesh data received" << LL_ENDL;
-			status = kNavMeshRequestError;
-		}
-		setRequestStatus(status);
-	}
+    llassert(pContent.has(NAVMESH_VERSION_FIELD));
+    if (pContent.has(NAVMESH_VERSION_FIELD))
+    {
+        llassert(pContent.get(NAVMESH_VERSION_FIELD).isInteger());
+        llassert(pContent.get(NAVMESH_VERSION_FIELD).asInteger() >= 0);
+        U32 embeddedNavMeshVersion = static_cast<U32>(pContent.get(NAVMESH_VERSION_FIELD).asInteger());
+        llassert(embeddedNavMeshVersion == pNavMeshVersion); // stinson 03/13/2012 : does this ever occur?
+        if (embeddedNavMeshVersion != pNavMeshVersion)
+        {
+            LL_WARNS() << "Mismatch between expected and embedded navmesh versions occurred" << LL_ENDL;
+            pNavMeshVersion = embeddedNavMeshVersion;
+        }
+    }
+
+    if (mNavMeshStatus.getVersion() == pNavMeshVersion)
+    {
+        ENavMeshRequestStatus status;
+        if ( pContent.has(NAVMESH_DATA_FIELD) )
+        {
+            const LLSD::Binary &value = pContent.get(NAVMESH_DATA_FIELD).asBinary();
+            unsigned int binSize = value.size();
+            std::string newStr(reinterpret_cast<const char *>(&value[0]), binSize);
+            std::istringstream streamdecomp( newStr );
+            size_t decompBinSize = 0;
+            bool valid = false;
+            U8* pUncompressedNavMeshContainer = unzip_llsdNavMesh( valid, decompBinSize, streamdecomp, binSize ) ;
+            if ( !valid )
+            {
+                LL_WARNS() << "Unable to decompress the navmesh llsd." << LL_ENDL;
+                status = kNavMeshRequestError;
+            }
+            else
+            {
+                llassert(pUncompressedNavMeshContainer);
+                mNavMeshData.resize( decompBinSize );
+                memcpy( &mNavMeshData[0], &pUncompressedNavMeshContainer[0], decompBinSize );
+                status = kNavMeshRequestCompleted;
+            }
+            if ( pUncompressedNavMeshContainer )
+            {
+                free( pUncompressedNavMeshContainer );
+            }
+        }
+        else
+        {
+            LL_WARNS() << "No mesh data received" << LL_ENDL;
+            status = kNavMeshRequestError;
+        }
+        setRequestStatus(status);
+    }
 }
 
 void LLPathfindingNavMesh::handleNavMeshNotEnabled()
 {
-	mNavMeshData.clear();
-	setRequestStatus(kNavMeshRequestNotEnabled);
+    mNavMeshData.clear();
+    setRequestStatus(kNavMeshRequestNotEnabled);
 }
 
 void LLPathfindingNavMesh::handleNavMeshError()
 {
-	mNavMeshData.clear();
-	setRequestStatus(kNavMeshRequestError);
+    mNavMeshData.clear();
+    setRequestStatus(kNavMeshRequestError);
 }
 
 void LLPathfindingNavMesh::handleNavMeshError(U32 pNavMeshVersion)
 {
-	if (mNavMeshStatus.getVersion() == pNavMeshVersion)
-	{
-		handleNavMeshError();
-	}
+    if (mNavMeshStatus.getVersion() == pNavMeshVersion)
+    {
+        handleNavMeshError();
+    }
 }
 
 void LLPathfindingNavMesh::setRequestStatus(ENavMeshRequestStatus pNavMeshRequestStatus)
 {
-	mNavMeshRequestStatus = pNavMeshRequestStatus;
-	sendStatus();
+    mNavMeshRequestStatus = pNavMeshRequestStatus;
+    sendStatus();
 }
 
 void LLPathfindingNavMesh::sendStatus()
 {
-	mNavMeshSignal(mNavMeshRequestStatus, mNavMeshStatus, mNavMeshData);
+    mNavMeshSignal(mNavMeshRequestStatus, mNavMeshStatus, mNavMeshData);
 }