Merge main into inventory_favorites

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

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/llui/llbadgeholder.h b/indra/llui/llbadgeholder.h
index 2538eaae91..470baf7a9a 100644
--- a/indra/llui/llbadgeholder.h
+++ b/indra/llui/llbadgeholder.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llbadgeholder.h
  * @brief Header for badge holders
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -37,19 +37,19 @@ class LLBadgeHolder
 {
 public:
 
-	LLBadgeHolder(bool acceptsBadge)
-		: mAcceptsBadge(acceptsBadge)
-	{
-	}
+    LLBadgeHolder(bool acceptsBadge)
+        : mAcceptsBadge(acceptsBadge)
+    {
+    }
 
-	void setAcceptsBadge(bool acceptsBadge) { mAcceptsBadge = acceptsBadge; }
-	bool acceptsBadge() const { return mAcceptsBadge; }
+    void setAcceptsBadge(bool acceptsBadge) { mAcceptsBadge = acceptsBadge; }
+    bool acceptsBadge() const { return mAcceptsBadge; }
 
-	virtual bool addBadge(LLBadge * badge);
+    virtual bool addBadge(LLBadge * badge);
 
 private:
 
-	bool		mAcceptsBadge;
+    bool        mAcceptsBadge;
 
 };