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

diff --git a/indra/llui/lluiusage.cpp b/indra/llui/lluiusage.cpp
index ccae6643b9..e617f60aba 100644
--- a/indra/llui/lluiusage.cpp
+++ b/indra/llui/lluiusage.cpp
@@ -39,108 +39,108 @@ LLUIUsage::~LLUIUsage()
 // static
 std::string LLUIUsage::sanitized(const std::string& s)
 {
-	// Remove characters that make the ViewerStats db unhappy
-	std::string result(s);
-	std::replace(result.begin(), result.end(), '.', '_');
-	std::replace(result.begin(), result.end(), ' ', '_');
-	return result;
+    // Remove characters that make the ViewerStats db unhappy
+    std::string result(s);
+    std::replace(result.begin(), result.end(), '.', '_');
+    std::replace(result.begin(), result.end(), ' ', '_');
+    return result;
 }
 
 // static
 void LLUIUsage::setLLSDPath(LLSD& sd, const std::string& path, S32 max_elts, const LLSD& val)
 {
-	// Keep the last max_elts components of the specified path
-	std::vector<std::string> fields;
-	boost::split(fields, path, boost::is_any_of("/"));
-	auto first_pos = std::max(fields.begin(), fields.end() - max_elts);
-	auto end_pos = fields.end();
-	std::vector<std::string> last_fields(first_pos,end_pos);
-
-	setLLSDNested(sd, last_fields, val);
+    // Keep the last max_elts components of the specified path
+    std::vector<std::string> fields;
+    boost::split(fields, path, boost::is_any_of("/"));
+    auto first_pos = std::max(fields.begin(), fields.end() - max_elts);
+    auto end_pos = fields.end();
+    std::vector<std::string> last_fields(first_pos,end_pos);
+
+    setLLSDNested(sd, last_fields, val);
 }
 
 // setLLSDNested()
-// Accomplish the equivalent of 
+// Accomplish the equivalent of
 //   sd[fields[0]][fields[1]]... = val;
 // for an arbitrary number of fields.
 // This might be useful as an LLSD utility function; is not specific to LLUIUsage
-// 
+//
 // static
 void LLUIUsage::setLLSDNested(LLSD& sd, const std::vector<std::string>& fields, const LLSD& val)
 {
-	LLSD* fsd = &sd;
-	for (auto it=fields.begin(); it!=fields.end(); ++it)
-	{
-		if (it == fields.end()-1)
-		{
-			(*fsd)[*it] = val;
-		}
-		else
-		{
-			if (!(*fsd)[*it].isMap())
-			{
-				(*fsd)[*it] = LLSD::emptyMap();
-			}
-			fsd = &(*fsd)[*it];
-		}
-	}
+    LLSD* fsd = &sd;
+    for (auto it=fields.begin(); it!=fields.end(); ++it)
+    {
+        if (it == fields.end()-1)
+        {
+            (*fsd)[*it] = val;
+        }
+        else
+        {
+            if (!(*fsd)[*it].isMap())
+            {
+                (*fsd)[*it] = LLSD::emptyMap();
+            }
+            fsd = &(*fsd)[*it];
+        }
+    }
 }
 
 void LLUIUsage::logCommand(const std::string& command)
 {
-	mCommandCounts[sanitized(command)]++;
-	LL_DEBUGS("UIUsage") << "command " << command << LL_ENDL;
+    mCommandCounts[sanitized(command)]++;
+    LL_DEBUGS("UIUsage") << "command " << command << LL_ENDL;
 }
 
 void LLUIUsage::logControl(const std::string& control)
 {
-	mControlCounts[sanitized(control)]++;
-	LL_DEBUGS("UIUsage") << "control " << control << LL_ENDL;
+    mControlCounts[sanitized(control)]++;
+    LL_DEBUGS("UIUsage") << "control " << control << LL_ENDL;
 }
 
 
 void LLUIUsage::logFloater(const std::string& floater)
 {
-	mFloaterCounts[sanitized(floater)]++;
-	LL_DEBUGS("UIUsage") << "floater " << floater << LL_ENDL;
+    mFloaterCounts[sanitized(floater)]++;
+    LL_DEBUGS("UIUsage") << "floater " << floater << LL_ENDL;
 }
 
 void LLUIUsage::logPanel(const std::string& p)
 {
-	mPanelCounts[sanitized(p)]++;
-	LL_DEBUGS("UIUsage") << "panel " << p << LL_ENDL;
+    mPanelCounts[sanitized(p)]++;
+    LL_DEBUGS("UIUsage") << "panel " << p << LL_ENDL;
 }
 
 LLSD LLUIUsage::asLLSD() const
 {
-	LLSD result;
-	for (auto const& it : mCommandCounts)
-	{
-		result["commands"][it.first] = LLSD::Integer(it.second);
-	}
-	for (auto const& it : mControlCounts)
-	{
-		setLLSDPath(result["controls"], it.first, 2, LLSD::Integer(it.second));
-	}
-	for (auto const& it : mFloaterCounts)
-	{
-		result["floaters"][it.first] = LLSD::Integer(it.second);
-	}
-	for (auto const& it : mPanelCounts)
-	{
-		result["panels"][it.first] = LLSD::Integer(it.second);
-	}
-	return result;
+    LLSD result;
+    for (auto const& it : mCommandCounts)
+    {
+        result["commands"][it.first] = LLSD::Integer(it.second);
+    }
+    for (auto const& it : mControlCounts)
+    {
+        setLLSDPath(result["controls"], it.first, 2, LLSD::Integer(it.second));
+    }
+    for (auto const& it : mFloaterCounts)
+    {
+        result["floaters"][it.first] = LLSD::Integer(it.second);
+    }
+    for (auto const& it : mPanelCounts)
+    {
+        result["panels"][it.first] = LLSD::Integer(it.second);
+    }
+    return result;
 }
 
 // Clear up some junk content generated during initial login/UI initialization
 void LLUIUsage::clear()
 {
 
-	LL_DEBUGS("UIUsage") << "clear" << LL_ENDL;
-	mCommandCounts.clear();
-	mControlCounts.clear();
-	mFloaterCounts.clear();
-	mPanelCounts.clear();
+    LL_DEBUGS("UIUsage") << "clear" << LL_ENDL;
+    mCommandCounts.clear();
+    mControlCounts.clear();
+    mFloaterCounts.clear();
+    mPanelCounts.clear();
 }