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

diff --git a/indra/newview/llpathfindingobjectlist.cpp b/indra/newview/llpathfindingobjectlist.cpp
index f1ecb45fc0..0ea782649c 100644
--- a/indra/newview/llpathfindingobjectlist.cpp
+++ b/indra/newview/llpathfindingobjectlist.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
 * @file llpathfindingobjectlist.cpp
 * @brief Implementation of llpathfindingobjectlist
 * @author Stinson@lindenlab.com
@@ -39,84 +39,84 @@
 //---------------------------------------------------------------------------
 
 LLPathfindingObjectList::LLPathfindingObjectList()
-	: mObjectMap()
+    : mObjectMap()
 {
 }
 
 LLPathfindingObjectList::~LLPathfindingObjectList()
 {
-	clear();
+    clear();
 }
 
 bool LLPathfindingObjectList::isEmpty() const
 {
-	return mObjectMap.empty();
+    return mObjectMap.empty();
 }
 
 void LLPathfindingObjectList::clear()
 {
-	for (LLPathfindingObjectMap::iterator objectIter = mObjectMap.begin(); objectIter != mObjectMap.end(); ++objectIter)
-	{
-		objectIter->second.reset();
-	}
-	mObjectMap.clear();
+    for (LLPathfindingObjectMap::iterator objectIter = mObjectMap.begin(); objectIter != mObjectMap.end(); ++objectIter)
+    {
+        objectIter->second.reset();
+    }
+    mObjectMap.clear();
 }
 
 void LLPathfindingObjectList::update(LLPathfindingObjectPtr pUpdateObjectPtr)
 {
-	if (pUpdateObjectPtr != NULL)
-	{
-		std::string updateObjectId = pUpdateObjectPtr->getUUID().asString();
+    if (pUpdateObjectPtr != NULL)
+    {
+        std::string updateObjectId = pUpdateObjectPtr->getUUID().asString();
 
-		LLPathfindingObjectMap::iterator foundObjectIter = mObjectMap.find(updateObjectId);
-		if (foundObjectIter == mObjectMap.end())
-		{
-			mObjectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(updateObjectId, pUpdateObjectPtr));
-		}
-		else
-		{
-			foundObjectIter->second = pUpdateObjectPtr;
-		}
-	}
+        LLPathfindingObjectMap::iterator foundObjectIter = mObjectMap.find(updateObjectId);
+        if (foundObjectIter == mObjectMap.end())
+        {
+            mObjectMap.insert(std::pair<std::string, LLPathfindingObjectPtr>(updateObjectId, pUpdateObjectPtr));
+        }
+        else
+        {
+            foundObjectIter->second = pUpdateObjectPtr;
+        }
+    }
 }
 
 void LLPathfindingObjectList::update(LLPathfindingObjectListPtr pUpdateObjectListPtr)
 {
-	if ((pUpdateObjectListPtr != NULL) && !pUpdateObjectListPtr->isEmpty())
-	{
-		for (LLPathfindingObjectMap::const_iterator updateObjectIter = pUpdateObjectListPtr->begin();
-			updateObjectIter != pUpdateObjectListPtr->end(); ++updateObjectIter)
-		{
-			const LLPathfindingObjectPtr updateObjectPtr = updateObjectIter->second;
-			update(updateObjectPtr);
-		}
-	}
+    if ((pUpdateObjectListPtr != NULL) && !pUpdateObjectListPtr->isEmpty())
+    {
+        for (LLPathfindingObjectMap::const_iterator updateObjectIter = pUpdateObjectListPtr->begin();
+            updateObjectIter != pUpdateObjectListPtr->end(); ++updateObjectIter)
+        {
+            const LLPathfindingObjectPtr updateObjectPtr = updateObjectIter->second;
+            update(updateObjectPtr);
+        }
+    }
 }
 
 LLPathfindingObjectPtr LLPathfindingObjectList::find(const std::string &pObjectId) const
 {
-	LLPathfindingObjectPtr objectPtr;
+    LLPathfindingObjectPtr objectPtr;
 
-	LLPathfindingObjectMap::const_iterator objectIter = mObjectMap.find(pObjectId);
-	if (objectIter != mObjectMap.end())
-	{
-		objectPtr = objectIter->second;
-	}
+    LLPathfindingObjectMap::const_iterator objectIter = mObjectMap.find(pObjectId);
+    if (objectIter != mObjectMap.end())
+    {
+        objectPtr = objectIter->second;
+    }
 
-	return objectPtr;
+    return objectPtr;
 }
 
 LLPathfindingObjectList::const_iterator LLPathfindingObjectList::begin() const
 {
-	return mObjectMap.begin();
+    return mObjectMap.begin();
 }
 
 LLPathfindingObjectList::const_iterator LLPathfindingObjectList::end() const
 {
-	return mObjectMap.end();
+    return mObjectMap.end();
 }
 
 LLPathfindingObjectMap &LLPathfindingObjectList::getObjectMap()
 {
-	return mObjectMap;
+    return mObjectMap;
 }