Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

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