Merge main into inventory_favorites

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

1 files changed, 32 insertions, 32 deletions

diff --git a/indra/llui/llstyle.cpp b/indra/llui/llstyle.cpp
index bb731f4f7e..a8c0aa8ad6 100644
--- a/indra/llui/llstyle.cpp
+++ b/indra/llui/llstyle.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llstyle.cpp
  * @brief Text style 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$
  */
@@ -33,72 +33,72 @@
 #include "llui.h"
 
 LLStyle::Params::Params()
-:	visible("visible", true),
-	drop_shadow("drop_shadow", LLFontGL::NO_SHADOW),
-	color("color", LLColor4::black),
-	readonly_color("readonly_color", LLColor4::black),
-	selected_color("selected_color", LLColor4::black),
-	font("font", LLFontGL::getFontMonospace()),
-	image("image"),
-	link_href("href"),
-	is_link("is_link")
+:   visible("visible", true),
+    drop_shadow("drop_shadow", LLFontGL::NO_SHADOW),
+    color("color", LLColor4::black),
+    readonly_color("readonly_color", LLColor4::black),
+    selected_color("selected_color", LLColor4::black),
+    font("font", LLFontGL::getFontMonospace()),
+    image("image"),
+    link_href("href"),
+    is_link("is_link")
 {}
 
 
 LLStyle::LLStyle(const LLStyle::Params& p)
-:	mVisible(p.visible),
-	mColor(p.color),
-	mReadOnlyColor(p.readonly_color),
-	mSelectedColor(p.selected_color),
-	mFont(p.font()),
-	mLink(p.link_href),
-	mIsLink(p.is_link.isProvided() ? p.is_link : !p.link_href().empty()),
-	mDropShadow(p.drop_shadow),
-	mImagep(p.image())
+:   mVisible(p.visible),
+    mColor(p.color),
+    mReadOnlyColor(p.readonly_color),
+    mSelectedColor(p.selected_color),
+    mFont(p.font()),
+    mLink(p.link_href),
+    mIsLink(p.is_link.isProvided() ? p.is_link : !p.link_href().empty()),
+    mDropShadow(p.drop_shadow),
+    mImagep(p.image())
 {}
 
 void LLStyle::setFont(const LLFontGL* font)
 {
-	mFont = font;
+    mFont = font;
 }
 
 
 const LLFontGL* LLStyle::getFont() const
 {
-	return mFont;
+    return mFont;
 }
 
 void LLStyle::setLinkHREF(const std::string& href)
 {
-	mLink = href;
+    mLink = href;
 }
 
 BOOL LLStyle::isLink() const
 {
-	return mIsLink;
+    return mIsLink;
 }
 
 BOOL LLStyle::isVisible() const
 {
-	return mVisible;
+    return mVisible;
 }
 
 void LLStyle::setVisible(BOOL is_visible)
 {
-	mVisible = is_visible;
+    mVisible = is_visible;
 }
 
 LLPointer<LLUIImage> LLStyle::getImage() const
 {
-	return mImagep;
+    return mImagep;
 }
 
 void LLStyle::setImage(const LLUUID& src)
 {
-	mImagep = LLUI::getUIImageByID(src);
+    mImagep = LLUI::getUIImageByID(src);
 }
 
 void LLStyle::setImage(const std::string& name)
 {
-	mImagep = LLUI::getUIImage(name);
+    mImagep = LLUI::getUIImage(name);
 }