Merge main into inventory_favorites

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

1 files changed, 21 insertions, 21 deletions

diff --git a/indra/llcommon/llliveappconfig.h b/indra/llcommon/llliveappconfig.h
index 4fd7c26a07..0dea643d87 100644
--- a/indra/llcommon/llliveappconfig.h
+++ b/indra/llcommon/llliveappconfig.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llliveappconfig.h
  * @brief Configuration information for an LLApp that overrides indra.xml
  *
  * $LicenseInfo:firstyear=2003&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$
  */
@@ -43,27 +43,27 @@ class LL_COMMON_API LLLiveAppConfig : public LLLiveFile
 {
 public:
 
-	/**
-	 * @brief Constructor
-	 *
-	 * @param filename. The name of the file for periodically checking
-	 * configuration.
-	 * @param refresh_period How often the internal timer should
-	 * bother checking the filesystem.
-	 * @param The application priority level of that configuration file.
-	 */
-	LLLiveAppConfig(
-		const std::string& filename,
-		F32 refresh_period,
-		LLApp::OptionPriority priority);
+    /**
+     * @brief Constructor
+     *
+     * @param filename. The name of the file for periodically checking
+     * configuration.
+     * @param refresh_period How often the internal timer should
+     * bother checking the filesystem.
+     * @param The application priority level of that configuration file.
+     */
+    LLLiveAppConfig(
+        const std::string& filename,
+        F32 refresh_period,
+        LLApp::OptionPriority priority);
 
-	~LLLiveAppConfig(); ///< Destructor
+    ~LLLiveAppConfig(); ///< Destructor
 
 protected:
-	/*virtual*/ bool loadFile();
+    /*virtual*/ bool loadFile();
 
 private:
-	LLApp::OptionPriority mPriority;
+    LLApp::OptionPriority mPriority;
 };
 
 #endif