Merge main into inventory_favorites

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

1 files changed, 14 insertions, 14 deletions

diff --git a/indra/newview/llurlhistory.h b/indra/newview/llurlhistory.h
index 3cce4cbe1d..68b5a36c0b 100644
--- a/indra/newview/llurlhistory.h
+++ b/indra/newview/llurlhistory.h
@@ -5,21 +5,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$
  */
@@ -34,22 +34,22 @@ class LLSD;
 class LLURLHistory
 {
 public:
-	// Loads an xml file of URLs.  Currently only supports Parcel URL history
-	static bool loadFile(const std::string& filename);
+    // Loads an xml file of URLs.  Currently only supports Parcel URL history
+    static bool loadFile(const std::string& filename);
 
-	// Saves the current history to XML
-	static bool saveFile(const std::string& filename);
+    // Saves the current history to XML
+    static bool saveFile(const std::string& filename);
 
-	static LLSD getURLHistory(const std::string& collection);
+    static LLSD getURLHistory(const std::string& collection);
 
-	static void addURL(const std::string& collection, const std::string& url);
-	static void removeURL(const std::string& collection, const std::string& url);
-	static void clear(const std::string& collection);
+    static void addURL(const std::string& collection, const std::string& url);
+    static void removeURL(const std::string& collection, const std::string& url);
+    static void clear(const std::string& collection);
 
-	static void limitSize(const std::string& collection);
+    static void limitSize(const std::string& collection);
 
 private:
-	static LLSD sHistorySD;
+    static LLSD sHistorySD;
 };
 
 #endif // LLURLHISTORY_H