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/llstylemap.cpp b/indra/newview/llstylemap.cpp
index 43fe37ac77..49eb27f710 100644
--- a/indra/newview/llstylemap.cpp
+++ b/indra/newview/llstylemap.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llstylemap.cpp
  * @brief LLStyleMap class implementation
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -36,48 +36,48 @@
 
 const LLStyle::Params &LLStyleMap::lookupAgent(const LLUUID &source)
 {
-	// Find this style in the map or add it if not.  This map holds links to residents' profiles.
-	if (mMap.find(source) == mMap.end())
-	{
-		LLStyle::Params style_params;
-		if (source != LLUUID::null)
-		{
-			style_params.color.control = "HTMLLinkColor";
-			style_params.readonly_color.control = "HTMLLinkColor";
-			style_params.link_href = LLSLURL("agent", source, "inspect").getSLURLString();
-		}
-		mMap[source] = style_params;
-	}
-	return mMap[source];
+    // Find this style in the map or add it if not.  This map holds links to residents' profiles.
+    if (mMap.find(source) == mMap.end())
+    {
+        LLStyle::Params style_params;
+        if (source != LLUUID::null)
+        {
+            style_params.color.control = "HTMLLinkColor";
+            style_params.readonly_color.control = "HTMLLinkColor";
+            style_params.link_href = LLSLURL("agent", source, "inspect").getSLURLString();
+        }
+        mMap[source] = style_params;
+    }
+    return mMap[source];
 }
 
 // This is similar to lookupAgent for any generic URL encoded style.
 const LLStyle::Params &LLStyleMap::lookup(const LLUUID& id, const std::string& link)
 {
-	// Find this style in the map or add it if not.
-	style_map_t::iterator iter = mMap.find(id);
-	if (iter == mMap.end())
-	{
-		LLStyle::Params style_params;
+    // Find this style in the map or add it if not.
+    style_map_t::iterator iter = mMap.find(id);
+    if (iter == mMap.end())
+    {
+        LLStyle::Params style_params;
 
-		if (id != LLUUID::null && !link.empty())
-		{
-			style_params.color.control = "HTMLLinkColor";
-			style_params.readonly_color.control = "HTMLLinkColor";
-			style_params.link_href = link;
-		}
-		else
-		{
-			style_params.color = LLColor4::white;
-			style_params.readonly_color = LLColor4::white;
-		}
-		mMap[id] = style_params;
-	}
-	else 
-	{
-		iter->second.link_href = link;
-	}
+        if (id != LLUUID::null && !link.empty())
+        {
+            style_params.color.control = "HTMLLinkColor";
+            style_params.readonly_color.control = "HTMLLinkColor";
+            style_params.link_href = link;
+        }
+        else
+        {
+            style_params.color = LLColor4::white;
+            style_params.readonly_color = LLColor4::white;
+        }
+        mMap[id] = style_params;
+    }
+    else
+    {
+        iter->second.link_href = link;
+    }
 
-	return mMap[id];
+    return mMap[id];
 }