Merge main into inventory_favorites

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

1 files changed, 17 insertions, 17 deletions

diff --git a/indra/llui/llbadgeowner.h b/indra/llui/llbadgeowner.h
index 4ce208fa0d..d2ac17cef0 100644
--- a/indra/llui/llbadgeowner.h
+++ b/indra/llui/llbadgeowner.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llbadgeowner.h
  * @brief Header for badge owners
  *
  * $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$
  */
@@ -38,24 +38,24 @@ class LLBadgeOwner
 {
 public:
 
-	LLBadgeOwner(LLHandle< LLView > viewHandle);
+    LLBadgeOwner(LLHandle< LLView > viewHandle);
+
+    void initBadgeParams(const LLBadge::Params& p);
+    void addBadgeToParentHolder();
 
-	void initBadgeParams(const LLBadge::Params& p);
-	void addBadgeToParentHolder();
-	
-	bool hasBadgeHolderParent() const { return mHasBadgeHolderParent; };
-	void setBadgeVisibility(bool visible);
-	void setDrawBadgeAtTop(bool draw_at_top);
-	void reshapeBadge(const LLRect& new_rect);
+    bool hasBadgeHolderParent() const { return mHasBadgeHolderParent; };
+    void setBadgeVisibility(bool visible);
+    void setDrawBadgeAtTop(bool draw_at_top);
+    void reshapeBadge(const LLRect& new_rect);
 
 private:
 
-	LLBadge* createBadge(const LLBadge::Params& p);
+    LLBadge* createBadge(const LLBadge::Params& p);
 
 private:
-	bool				mHasBadgeHolderParent;
-	LLBadge*			mBadge;
-	LLHandle< LLView >	mBadgeOwnerView;
+    bool                mHasBadgeHolderParent;
+    LLBadge*            mBadge;
+    LLHandle< LLView >  mBadgeOwnerView;
 };
 
 #endif  // LL_LLBADGEOWNER_H