Merge main into inventory_favorites

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

1 files changed, 22 insertions, 22 deletions

diff --git a/indra/newview/llsyswellitem.cpp b/indra/newview/llsyswellitem.cpp
index 2a58f018e7..a79146ecc8 100644
--- a/indra/newview/llsyswellitem.cpp
+++ b/indra/newview/llsyswellitem.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsyswellitem.cpp
  * @brief                                    // TODO
  *
  * $LicenseInfo:firstyear=2000&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$
  */
@@ -35,19 +35,19 @@
 
 //---------------------------------------------------------------------------------
 LLSysWellItem::LLSysWellItem(const Params& p) : LLPanel(p),
-												mTitle(NULL),
-												mCloseBtn(NULL)
+                                                mTitle(NULL),
+                                                mCloseBtn(NULL)
 {
-	buildFromFile( "panel_sys_well_item.xml");
+    buildFromFile( "panel_sys_well_item.xml");
 
-	mTitle = getChild<LLTextBox>("title");
-	mCloseBtn = getChild<LLButton>("close_btn");
+    mTitle = getChild<LLTextBox>("title");
+    mCloseBtn = getChild<LLButton>("close_btn");
 
-	mTitle->setContentTrusted(false);
-	mTitle->setValue(p.title);
-	mCloseBtn->setClickedCallback(boost::bind(&LLSysWellItem::onClickCloseBtn,this));
+    mTitle->setContentTrusted(false);
+    mTitle->setValue(p.title);
+    mCloseBtn->setClickedCallback(boost::bind(&LLSysWellItem::onClickCloseBtn,this));
 
-	mID = p.notification_id;
+    mID = p.notification_id;
 }
 
 //---------------------------------------------------------------------------------
@@ -58,35 +58,35 @@ LLSysWellItem::~LLSysWellItem()
 //---------------------------------------------------------------------------------
 void LLSysWellItem::setTitle( std::string title )
 {
-	mTitle->setValue(title);
+    mTitle->setValue(title);
 }
 
 //---------------------------------------------------------------------------------
 void LLSysWellItem::onClickCloseBtn()
 {
-	mOnItemClose(this);
+    mOnItemClose(this);
 }
 
 //---------------------------------------------------------------------------------
 BOOL LLSysWellItem::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	BOOL res = LLPanel::handleMouseDown(x, y, mask);
-	if(!mCloseBtn->getRect().pointInRect(x, y))
-		mOnItemClick(this);
+    BOOL res = LLPanel::handleMouseDown(x, y, mask);
+    if(!mCloseBtn->getRect().pointInRect(x, y))
+        mOnItemClick(this);
 
-	return res;
+    return res;
 }
 
 //---------------------------------------------------------------------------------
 void LLSysWellItem::onMouseEnter(S32 x, S32 y, MASK mask)
 {
-	setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemSelected" ));
+    setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemSelected" ));
 }
 
 //---------------------------------------------------------------------------------
 void LLSysWellItem::onMouseLeave(S32 x, S32 y, MASK mask)
 {
-	setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemUnselected" ));
+    setTransparentColor(LLUIColorTable::instance().getColor( "SysWellItemUnselected" ));
 }
 
 //---------------------------------------------------------------------------------