Merge main into inventory_favorites

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

1 files changed, 70 insertions, 70 deletions

diff --git a/indra/llui/lliconctrl.cpp b/indra/llui/lliconctrl.cpp
index 2791377a5e..38c869cd59 100644
--- a/indra/llui/lliconctrl.cpp
+++ b/indra/llui/lliconctrl.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lliconctrl.cpp
  * @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$
  */
@@ -28,7 +28,7 @@
 
 #include "lliconctrl.h"
 
-// Linden library includes 
+// Linden library includes
 
 // Project includes
 #include "llcontrol.h"
@@ -42,48 +42,48 @@
 static LLDefaultChildRegistry::Register<LLIconCtrl> r("icon");
 
 LLIconCtrl::Params::Params()
-:	image("image_name"),
-	color("color"),
-	use_draw_context_alpha("use_draw_context_alpha", true),
+:   image("image_name"),
+    color("color"),
+    use_draw_context_alpha("use_draw_context_alpha", true),
     interactable("interactable", false),
-	scale_image("scale_image"),
-	min_width("min_width", 0),
-	min_height("min_height", 0)
+    scale_image("scale_image"),
+    min_width("min_width", 0),
+    min_height("min_height", 0)
 {}
 
 LLIconCtrl::LLIconCtrl(const LLIconCtrl::Params& p)
-:	LLUICtrl(p),
-	mColor(p.color()),
-	mImagep(p.image),
-	mUseDrawContextAlpha(p.use_draw_context_alpha),
+:   LLUICtrl(p),
+    mColor(p.color()),
+    mImagep(p.image),
+    mUseDrawContextAlpha(p.use_draw_context_alpha),
     mInteractable(p.interactable),
-	mPriority(0),
-	mMinWidth(p.min_width),
-	mMinHeight(p.min_height),
-	mMaxWidth(0),
-	mMaxHeight(0)
+    mPriority(0),
+    mMinWidth(p.min_width),
+    mMinHeight(p.min_height),
+    mMaxWidth(0),
+    mMaxHeight(0)
 {
-	if (mImagep.notNull())
-	{
-		LLUICtrl::setValue(mImagep->getName());
-	}
+    if (mImagep.notNull())
+    {
+        LLUICtrl::setValue(mImagep->getName());
+    }
 }
 
 LLIconCtrl::~LLIconCtrl()
 {
-	mImagep = NULL;
+    mImagep = NULL;
 }
 
 
 void LLIconCtrl::draw()
 {
-	if( mImagep.notNull() )
-	{
-		const F32 alpha = mUseDrawContextAlpha ? getDrawContext().mAlpha : getCurrentTransparency();
-		mImagep->draw(getLocalRect(), mColor.get() % alpha );
-	}
+    if( mImagep.notNull() )
+    {
+        const F32 alpha = mUseDrawContextAlpha ? getDrawContext().mAlpha : getCurrentTransparency();
+        mImagep->draw(getLocalRect(), mColor.get() % alpha );
+    }
 
-	LLUICtrl::draw();
+    LLUICtrl::draw();
 }
 
 BOOL LLIconCtrl::handleHover(S32 x, S32 y, MASK mask)
@@ -98,18 +98,18 @@ BOOL LLIconCtrl::handleHover(S32 x, S32 y, MASK mask)
 
 void LLIconCtrl::onVisibilityChange(BOOL new_visibility)
 {
-	LLUICtrl::onVisibilityChange(new_visibility);
-	if (mPriority == LLGLTexture::BOOST_ICON)
-	{
-		if (new_visibility)
-		{
-			loadImage(getValue(), mPriority);
-		}
-		else
-		{
-			mImagep = nullptr;
-		}
-	}
+    LLUICtrl::onVisibilityChange(new_visibility);
+    if (mPriority == LLGLTexture::BOOST_ICON)
+    {
+        if (new_visibility)
+        {
+            loadImage(getValue(), mPriority);
+        }
+        else
+        {
+            mImagep = nullptr;
+        }
+    }
 }
 
 // virtual
@@ -121,35 +121,35 @@ void LLIconCtrl::setValue(const LLSD& value)
 
 void LLIconCtrl::setValue(const LLSD& value, S32 priority)
 {
-	LLSD tvalue(value);
-	if (value.isString() && LLUUID::validate(value.asString()))
-	{
-		//RN: support UUIDs masquerading as strings
-		tvalue = LLSD(LLUUID(value.asString()));
-	}
-	LLUICtrl::setValue(tvalue);
-
-	loadImage(tvalue, priority);
+    LLSD tvalue(value);
+    if (value.isString() && LLUUID::validate(value.asString()))
+    {
+        //RN: support UUIDs masquerading as strings
+        tvalue = LLSD(LLUUID(value.asString()));
+    }
+    LLUICtrl::setValue(tvalue);
+
+    loadImage(tvalue, priority);
 }
 
 void LLIconCtrl::loadImage(const LLSD& tvalue, S32 priority)
 {
-	if(mPriority == LLGLTexture::BOOST_ICON && !getVisible()) return;
+    if(mPriority == LLGLTexture::BOOST_ICON && !getVisible()) return;
 
-	if (tvalue.isUUID())
-	{
+    if (tvalue.isUUID())
+    {
         mImagep = LLUI::getUIImageByID(tvalue.asUUID(), priority);
-	}
-	else
-	{
+    }
+    else
+    {
         mImagep = LLUI::getUIImage(tvalue.asString(), priority);
-	}
+    }
 
-	if(mImagep.notNull() 
-		&& mImagep->getImage().notNull() 
-		&& mMinWidth 
-		&& mMinHeight)
-	{
+    if(mImagep.notNull()
+        && mImagep->getImage().notNull()
+        && mMinWidth
+        && mMinHeight)
+    {
         S32 desired_draw_width = llmax(mMinWidth, mImagep->getWidth());
         S32 desired_draw_height = llmax(mMinHeight, mImagep->getHeight());
         if (mMaxWidth && mMaxHeight)
@@ -159,15 +159,15 @@ void LLIconCtrl::loadImage(const LLSD& tvalue, S32 priority)
         }
 
         mImagep->getImage()->setKnownDrawSize(desired_draw_width, desired_draw_height);
-	}
+    }
 }
 
 std::string LLIconCtrl::getImageName() const
 {
-	if (getValue().isString())
-		return getValue().asString();
-	else
-		return std::string();
+    if (getValue().isString())
+        return getValue().asString();
+    else
+        return std::string();
 }