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

diff --git a/indra/newview/llurlhistory.cpp b/indra/newview/llurlhistory.cpp
index f7064e152a..b44d0a57bd 100644
--- a/indra/newview/llurlhistory.cpp
+++ b/indra/newview/llurlhistory.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2007&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$
  */
@@ -42,7 +42,7 @@ bool LLURLHistory::loadFile(const std::string& filename)
 {
     bool dataloaded = false;
     sHistorySD = LLSD();
-	LLSD data;
+    LLSD data;
 
     std::string user_filename(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + filename);
 
@@ -65,60 +65,60 @@ bool LLURLHistory::loadFile(const std::string& filename)
     {
         LL_INFOS() << "Unable to open history file at " << user_filename << LL_ENDL;
     }
-	return dataloaded;
+    return dataloaded;
 }
 
 // static
 bool LLURLHistory::saveFile(const std::string& filename)
-{	
-	std::string temp_str = gDirUtilp->getLindenUserDir();
-	if( temp_str.empty() )
-	{
-		LL_INFOS() << "Can't save URL history - no user directory set yet." << LL_ENDL;
-		return false;
-	}
-
-	temp_str += gDirUtilp->getDirDelimiter() + filename;
-	llofstream out(temp_str.c_str());
-	if (!out.good())
-	{
-		LL_WARNS() << "Unable to open " << temp_str << " for output." << LL_ENDL;
-		return false;
-	}
-
-	LLSDSerialize::toXML(sHistorySD, out);
-
-	out.close();
-	return true;
+{
+    std::string temp_str = gDirUtilp->getLindenUserDir();
+    if( temp_str.empty() )
+    {
+        LL_INFOS() << "Can't save URL history - no user directory set yet." << LL_ENDL;
+        return false;
+    }
+
+    temp_str += gDirUtilp->getDirDelimiter() + filename;
+    llofstream out(temp_str.c_str());
+    if (!out.good())
+    {
+        LL_WARNS() << "Unable to open " << temp_str << " for output." << LL_ENDL;
+        return false;
+    }
+
+    LLSDSerialize::toXML(sHistorySD, out);
+
+    out.close();
+    return true;
 }
 // static
 // This function returns a portion of the history llsd that contains the collected
 // url history
 LLSD LLURLHistory::getURLHistory(const std::string& collection)
 {
-	if(sHistorySD.has(collection))
-	{
-		return sHistorySD[collection];
-	}
-	return LLSD();
+    if(sHistorySD.has(collection))
+    {
+        return sHistorySD[collection];
+    }
+    return LLSD();
 }
 
 // static
 void LLURLHistory::addURL(const std::string& collection, const std::string& url)
 {
-	if(!url.empty())
-	{
+    if(!url.empty())
+    {
         LLURI u(url);
         std::string simplified_url = u.scheme() + "://" + u.authority() + u.path();
-		sHistorySD[collection].insert(0, simplified_url);
-		LLURLHistory::limitSize(collection);
-	}
+        sHistorySD[collection].insert(0, simplified_url);
+        LLURLHistory::limitSize(collection);
+    }
 }
 // static
 void LLURLHistory::removeURL(const std::string& collection, const std::string& url)
 {
-	if(!url.empty())
-	{
+    if(!url.empty())
+    {
         LLURI u(url);
         std::string simplified_url = u.scheme() + "://" + u.authority() + u.path();
         for(int index = 0; index < sHistorySD[collection].size(); index++)
@@ -134,14 +134,14 @@ void LLURLHistory::removeURL(const std::string& collection, const std::string& u
 // static
 void LLURLHistory::clear(const std::string& collection)
 {
-	sHistorySD[ collection ] = LLSD();
+    sHistorySD[ collection ] = LLSD();
 }
 
 void LLURLHistory::limitSize(const std::string& collection)
 {
-	while(sHistorySD[collection].size() > MAX_URL_COUNT)
-	{
-		sHistorySD[collection].erase(MAX_URL_COUNT);
-	}
+    while(sHistorySD[collection].size() > MAX_URL_COUNT)
+    {
+        sHistorySD[collection].erase(MAX_URL_COUNT);
+    }
 }