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

diff --git a/indra/llui/lltextutil.cpp b/indra/llui/lltextutil.cpp
index 78049319bc..8ffce1b8b4 100644
--- a/indra/llui/lltextutil.cpp
+++ b/indra/llui/lltextutil.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltextutil.cpp
  * @brief Misc text-related auxiliary methods
  *
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -30,30 +30,30 @@
 #include "lltextbox.h"
 #include "llurlmatch.h"
 
-boost::function<bool(LLUrlMatch*,LLTextBase*)>	LLTextUtil::TextHelpers::iconCallbackCreationFunction = 0;
+boost::function<bool(LLUrlMatch*,LLTextBase*)>  LLTextUtil::TextHelpers::iconCallbackCreationFunction = 0;
 
 void LLTextUtil::textboxSetHighlightedVal(LLTextBox *txtbox, const LLStyle::Params& normal_style, const std::string& text, const std::string& hl)
 {
-	static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", LLColor4::green);
+    static LLUIColor sFilterTextColor = LLUIColorTable::instance().getColor("FilterTextColor", LLColor4::green);
 
-	std::string text_uc = text;
-	LLStringUtil::toUpper(text_uc);
+    std::string text_uc = text;
+    LLStringUtil::toUpper(text_uc);
 
-	size_t hl_begin = 0, hl_len = hl.size();
+    size_t hl_begin = 0, hl_len = hl.size();
 
-	if (hl_len == 0 || (hl_begin = text_uc.find(hl)) == std::string::npos)
-	{
-		txtbox->setText(text, normal_style);
-		return;
-	}
+    if (hl_len == 0 || (hl_begin = text_uc.find(hl)) == std::string::npos)
+    {
+        txtbox->setText(text, normal_style);
+        return;
+    }
 
-	LLStyle::Params hl_style = normal_style;
-	hl_style.color = sFilterTextColor;
+    LLStyle::Params hl_style = normal_style;
+    hl_style.color = sFilterTextColor;
 
-	txtbox->setText(LLStringUtil::null); // clear text
-	txtbox->appendText(text.substr(0, hl_begin),		false, normal_style);
-	txtbox->appendText(text.substr(hl_begin, hl_len),	false, hl_style);
-	txtbox->appendText(text.substr(hl_begin + hl_len),	false, normal_style);
+    txtbox->setText(LLStringUtil::null); // clear text
+    txtbox->appendText(text.substr(0, hl_begin),        false, normal_style);
+    txtbox->appendText(text.substr(hl_begin, hl_len),   false, hl_style);
+    txtbox->appendText(text.substr(hl_begin + hl_len),  false, normal_style);
 }
 
 void LLTextUtil::textboxSetGreyedVal(LLTextBox *txtbox, const LLStyle::Params& normal_style, const std::string& text, const std::string& greyed)
@@ -78,34 +78,34 @@ void LLTextUtil::textboxSetGreyedVal(LLTextBox *txtbox, const LLStyle::Params& n
 
 bool LLTextUtil::processUrlMatch(LLUrlMatch* match,LLTextBase* text_base, bool is_content_trusted)
 {
-	if (match == 0 || text_base == 0)
-		return false;
-
-	if(match->getID() != LLUUID::null && TextHelpers::iconCallbackCreationFunction)
-	{
-		bool segment_created = TextHelpers::iconCallbackCreationFunction(match,text_base);
-		if(segment_created)
-			return true;
-	}
-
-	// output an optional icon before the Url
-	if (is_content_trusted && !match->getIcon().empty() )
-	{
-		LLUIImagePtr image = LLUI::getUIImage(match->getIcon());
-		if (image)
-		{
-			LLStyle::Params icon;
-			icon.image = image;
-			// Text will be replaced during rendering with the icon,
-			// but string cannot be empty or the segment won't be
-			// added (or drawn).
-			text_base->appendImageSegment(icon);
-
-			return true;
-		}
-	}
-	
-	return false;
+    if (match == 0 || text_base == 0)
+        return false;
+
+    if(match->getID() != LLUUID::null && TextHelpers::iconCallbackCreationFunction)
+    {
+        bool segment_created = TextHelpers::iconCallbackCreationFunction(match,text_base);
+        if(segment_created)
+            return true;
+    }
+
+    // output an optional icon before the Url
+    if (is_content_trusted && !match->getIcon().empty() )
+    {
+        LLUIImagePtr image = LLUI::getUIImage(match->getIcon());
+        if (image)
+        {
+            LLStyle::Params icon;
+            icon.image = image;
+            // Text will be replaced during rendering with the icon,
+            // but string cannot be empty or the segment won't be
+            // added (or drawn).
+            text_base->appendImageSegment(icon);
+
+            return true;
+        }
+    }
+
+    return false;
 }
 
 // EOF