Merge main into inventory_favorites

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

1 files changed, 41 insertions, 41 deletions

diff --git a/indra/llui/lliconctrl.h b/indra/llui/lliconctrl.h
index e983d63a01..240fe3a74c 100644
--- a/indra/llui/lliconctrl.h
+++ b/indra/llui/lliconctrl.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lliconctrl.h
  * @brief LLIconCtrl base class
  *
  * $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$
  */
@@ -46,62 +46,62 @@ class LLIconCtrl
 : public LLUICtrl
 {
 public:
-	struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
-	{
-		Optional<LLUIImage*>	image;
-		Optional<LLUIColor>		color;
-		Optional<bool>			use_draw_context_alpha,
+    struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
+    {
+        Optional<LLUIImage*>    image;
+        Optional<LLUIColor>     color;
+        Optional<bool>          use_draw_context_alpha,
                                 interactable;
-		Optional<S32>			min_width,
-								min_height;
-		Ignored					scale_image;
+        Optional<S32>           min_width,
+                                min_height;
+        Ignored                 scale_image;
 
-		Params();
-	};
+        Params();
+    };
 protected:
-	LLIconCtrl(const Params&);
-	friend class LLUICtrlFactory;
+    LLIconCtrl(const Params&);
+    friend class LLUICtrlFactory;
 
-	void setValue(const LLSD& value, S32 priority);
+    void setValue(const LLSD& value, S32 priority);
 
 public:
-	virtual ~LLIconCtrl();
+    virtual ~LLIconCtrl();
 
-	// llview overrides
-	virtual void	draw();
+    // llview overrides
+    virtual void    draw();
 
     // llview overrides
     virtual BOOL handleHover(S32 x, S32 y, MASK mask);
 
-	// lluictrl overrides
-	void onVisibilityChange(BOOL new_visibility);
-	virtual void	setValue(const LLSD& value );
+    // lluictrl overrides
+    void onVisibilityChange(BOOL new_visibility);
+    virtual void    setValue(const LLSD& value );
+
+    std::string getImageName() const;
 
-	std::string	getImageName() const;
+    void            setColor(const LLColor4& color) { mColor = color; }
+    void            setImage(LLPointer<LLUIImage> image) { mImagep = image; }
+    const LLPointer<LLUIImage> getImage() { return mImagep; }
 
-	void			setColor(const LLColor4& color) { mColor = color; }
-	void			setImage(LLPointer<LLUIImage> image) { mImagep = image; }
-	const LLPointer<LLUIImage> getImage() { return mImagep; }
-	
 protected:
-	S32 mPriority;
+    S32 mPriority;
 
-	//the output size of the icon image if set.
-	S32 mMinWidth,
-		mMinHeight,
-		mMaxWidth,
-		mMaxHeight;
+    //the output size of the icon image if set.
+    S32 mMinWidth,
+        mMinHeight,
+        mMaxWidth,
+        mMaxHeight;
 
-	// If set to true (default), use the draw context transparency.
-	// If false, will use transparency returned by getCurrentTransparency(). See STORM-698.
-	bool mUseDrawContextAlpha;
+    // If set to true (default), use the draw context transparency.
+    // If false, will use transparency returned by getCurrentTransparency(). See STORM-698.
+    bool mUseDrawContextAlpha;
     bool mInteractable;
 
 private:
-	void loadImage(const LLSD& value, S32 priority);
+    void loadImage(const LLSD& value, S32 priority);
 
-	LLUIColor mColor;
-	LLPointer<LLUIImage> mImagep;
+    LLUIColor mColor;
+    LLPointer<LLUIImage> mImagep;
 };
 
 #endif