Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/llcommon/llformat.cpp b/indra/llcommon/llformat.cpp
index 3b2b3038ea..dc5726e29f 100644
--- a/indra/llcommon/llformat.cpp
+++ b/indra/llcommon/llformat.cpp
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llformat.cpp
  * @date   January 2007
  * @brief string formatting utility
@@ -6,21 +6,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$
  */
@@ -35,36 +35,36 @@
 // wrapper for vsnprintf to be called from llformatXXX functions.
 static void va_format(std::string& out, const char *fmt, va_list va)
 {
-	char tstr[1024];	/* Flawfinder: ignore */
+    char tstr[1024];    /* Flawfinder: ignore */
 #if LL_WINDOWS
-	_vsnprintf(tstr, 1024, fmt, va);
+    _vsnprintf(tstr, 1024, fmt, va);
 #else
-	vsnprintf(tstr, 1024, fmt, va);	/* Flawfinder: ignore */
+    vsnprintf(tstr, 1024, fmt, va); /* Flawfinder: ignore */
 #endif
-	out.assign(tstr);
+    out.assign(tstr);
 }
 
 std::string llformat(const char *fmt, ...)
 {
-	std::string res;
-	va_list va;
-	va_start(va, fmt);
-	va_format(res, fmt, va);
-	va_end(va);
-	return res;
+    std::string res;
+    va_list va;
+    va_start(va, fmt);
+    va_format(res, fmt, va);
+    va_end(va);
+    return res;
 }
 
 std::string llformat_to_utf8(const char *fmt, ...)
 {
-	std::string res;
-	va_list va;
-	va_start(va, fmt);
-	va_format(res, fmt, va);
-	va_end(va);
+    std::string res;
+    va_list va;
+    va_start(va, fmt);
+    va_format(res, fmt, va);
+    va_end(va);
 
 #if LL_WINDOWS
-	// made converting to utf8. See EXT-8318.
-	res = ll_convert_string_to_utf8_string(res);
+    // made converting to utf8. See EXT-8318.
+    res = ll_convert_string_to_utf8_string(res);
 #endif
-	return res;
+    return res;
 }