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

diff --git a/indra/llcommon/llregex.h b/indra/llcommon/llregex.h
index 2b7f5e47c2..18da304aee 100644
--- a/indra/llcommon/llregex.h
+++ b/indra/llcommon/llregex.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llregex.h
  *
  * $LicenseInfo:firstyear=2021&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2021, 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,60 +30,60 @@
 template <typename S, typename M, typename R>
 LL_COMMON_API bool ll_regex_match(const S& string, M& match, const R& regex)
 {
-	try
-	{
-		return boost::regex_match(string, match, regex);
-	}
-	catch (const std::runtime_error& e)
-	{
-		LL_WARNS() << "error matching with '" << regex.str() << "': "
-			<< e.what() << ":\n'" << string << "'" << LL_ENDL;
-		return false;
-	}
+    try
+    {
+        return boost::regex_match(string, match, regex);
+    }
+    catch (const std::runtime_error& e)
+    {
+        LL_WARNS() << "error matching with '" << regex.str() << "': "
+            << e.what() << ":\n'" << string << "'" << LL_ENDL;
+        return false;
+    }
 }
 
 template <typename S, typename R>
 LL_COMMON_API bool ll_regex_match(const S& string, const R& regex)
 {
-	try
-	{
-		return boost::regex_match(string, regex);
-	}
-	catch (const std::runtime_error& e)
-	{
-		LL_WARNS() << "error matching with '" << regex.str() << "': "
-			<< e.what() << ":\n'" << string << "'" << LL_ENDL;
-		return false;
-	}
+    try
+    {
+        return boost::regex_match(string, regex);
+    }
+    catch (const std::runtime_error& e)
+    {
+        LL_WARNS() << "error matching with '" << regex.str() << "': "
+            << e.what() << ":\n'" << string << "'" << LL_ENDL;
+        return false;
+    }
 }
 
 template <typename S, typename M, typename R>
 bool ll_regex_search(const S& string, M& match, const R& regex)
 {
-	try
-	{
-		return boost::regex_search(string, match, regex);
-	}
-	catch (const std::runtime_error& e)
-	{
-		LL_WARNS() << "error searching with '" << regex.str() << "': "
-			<< e.what() << ":\n'" << string << "'" << LL_ENDL;
-		return false;
-	}
+    try
+    {
+        return boost::regex_search(string, match, regex);
+    }
+    catch (const std::runtime_error& e)
+    {
+        LL_WARNS() << "error searching with '" << regex.str() << "': "
+            << e.what() << ":\n'" << string << "'" << LL_ENDL;
+        return false;
+    }
 }
 
 template <typename S, typename R>
 bool ll_regex_search(const S& string, const R& regex)
 {
-	try
-	{
-		return boost::regex_search(string, regex);
-	}
-	catch (const std::runtime_error& e)
-	{
-		LL_WARNS() << "error searching with '" << regex.str() << "': "
-			<< e.what() << ":\n'" << string << "'" << LL_ENDL;
-		return false;
-	}
+    try
+    {
+        return boost::regex_search(string, regex);
+    }
+    catch (const std::runtime_error& e)
+    {
+        LL_WARNS() << "error searching with '" << regex.str() << "': "
+            << e.what() << ":\n'" << string << "'" << LL_ENDL;
+        return false;
+    }
 }
 #endif  // LLREGEX_H