Merge main into inventory_favorites

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

1 files changed, 42 insertions, 42 deletions

diff --git a/indra/llui/llscrollingpanellist.h b/indra/llui/llscrollingpanellist.h
index d625039427..ad717a455b 100644
--- a/indra/llui/llscrollingpanellist.h
+++ b/indra/llui/llscrollingpanellist.h
@@ -1,24 +1,24 @@
-/** 
+/**
  * @file llscrollingpanellist.h
  *
  * $LicenseInfo:firstyear=2006&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$
  */
@@ -39,8 +39,8 @@
 class LLScrollingPanel : public LLPanel
 {
 public:
-	LLScrollingPanel(const LLPanel::Params& params) : LLPanel(params) {}
-	virtual void updatePanel(BOOL allow_modify) = 0;
+    LLScrollingPanel(const LLPanel::Params& params) : LLPanel(params) {}
+    virtual void updatePanel(BOOL allow_modify) = 0;
 };
 
 
@@ -50,53 +50,53 @@ public:
 class LLScrollingPanelList : public LLUICtrl
 {
 public:
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<bool> is_horizontal;
-		Optional<S32> padding;
-		Optional<S32> spacing;
+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+    {
+        Optional<bool> is_horizontal;
+        Optional<S32> padding;
+        Optional<S32> spacing;
+
+        Params();
+    };
 
-		Params();
-	};
+    LLScrollingPanelList(const Params& p);
 
-	LLScrollingPanelList(const Params& p);
-	
-	static const S32 DEFAULT_SPACING = 6;
-	static const S32 DEFAULT_PADDING = 2;
+    static const S32 DEFAULT_SPACING = 6;
+    static const S32 DEFAULT_PADDING = 2;
 
-	typedef std::deque<LLScrollingPanel*>	panel_list_t;
+    typedef std::deque<LLScrollingPanel*>   panel_list_t;
 
-	virtual void setValue(const LLSD& value) {};
+    virtual void setValue(const LLSD& value) {};
 
-	virtual void		draw();
+    virtual void        draw();
 
-	void				clearPanels();
-	S32					addPanel(LLScrollingPanel* panel, bool back = false);
-	void				removePanel(LLScrollingPanel* panel);
-	void				removePanel(U32 panel_index);
-	void				updatePanels(BOOL allow_modify);
-	void				rearrange();
+    void                clearPanels();
+    S32                 addPanel(LLScrollingPanel* panel, bool back = false);
+    void                removePanel(LLScrollingPanel* panel);
+    void                removePanel(U32 panel_index);
+    void                updatePanels(BOOL allow_modify);
+    void                rearrange();
 
-	const panel_list_t&	getPanelList() const { return mPanelList; }
-	bool				getIsHorizontal() const { return mIsHorizontal; }
-	void				setPadding(S32 padding) { mPadding = padding; rearrange(); }
-	void				setSpacing(S32 spacing) { mSpacing = spacing; rearrange(); }
-	S32					getPadding() const { return mPadding; }
-	S32					getSpacing() const { return mSpacing; }
+    const panel_list_t& getPanelList() const { return mPanelList; }
+    bool                getIsHorizontal() const { return mIsHorizontal; }
+    void                setPadding(S32 padding) { mPadding = padding; rearrange(); }
+    void                setSpacing(S32 spacing) { mSpacing = spacing; rearrange(); }
+    S32                 getPadding() const { return mPadding; }
+    S32                 getSpacing() const { return mSpacing; }
 
 private:
-	void				updatePanelVisiblilty();
+    void                updatePanelVisiblilty();
 
-	/**
-	 * Notify parent about size change, makes sense when used inside accordion
-	 */
-	void				notifySizeChanged();
+    /**
+     * Notify parent about size change, makes sense when used inside accordion
+     */
+    void                notifySizeChanged();
 
-	bool				mIsHorizontal;
-	S32					mPadding;
-	S32					mSpacing;
+    bool                mIsHorizontal;
+    S32                 mPadding;
+    S32                 mSpacing;
 
-	panel_list_t		mPanelList;
+    panel_list_t        mPanelList;
 };
 
 #endif //LL_LLSCROLLINGPANELLIST_H