Merge main into inventory_favorites

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

1 files changed, 33 insertions, 33 deletions

diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp
index 885c1442a0..50b4cb0c93 100644
--- a/indra/newview/lltoolindividual.cpp
+++ b/indra/newview/lltoolindividual.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file lltoolindividual.cpp
  * @brief LLToolIndividual class implementation
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -68,46 +68,46 @@ LLToolIndividual::~LLToolIndividual()
 
 BOOL LLToolIndividual::handleMouseDown(S32 x, S32 y, MASK mask)
 {
-	gViewerWindow->pickAsync(x, y, mask, pickCallback);
-	return TRUE;
+    gViewerWindow->pickAsync(x, y, mask, pickCallback);
+    return TRUE;
 }
 
 void LLToolIndividual::pickCallback(const LLPickInfo& pick_info)
 {
-	LLViewerObject* obj = pick_info.getObject();
-	LLSelectMgr::getInstance()->deselectAll();
-	if(obj)
-	{
-		LLSelectMgr::getInstance()->selectObjectOnly(obj);
-	}
+    LLViewerObject* obj = pick_info.getObject();
+    LLSelectMgr::getInstance()->deselectAll();
+    if(obj)
+    {
+        LLSelectMgr::getInstance()->selectObjectOnly(obj);
+    }
 }
 
 BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
-	if(!LLSelectMgr::getInstance()->getSelection()->isEmpty())
-	{
-		// You should already have an object selected from the mousedown.
-		// If so, show its inventory. 
-		LLFloaterReg::showInstance("build", "Content");
-		return TRUE;
-	}
-	else
-	{
-		// Nothing selected means the first mouse click was probably
-		// bad, so try again.
-		return FALSE;
-	}
+    if(!LLSelectMgr::getInstance()->getSelection()->isEmpty())
+    {
+        // You should already have an object selected from the mousedown.
+        // If so, show its inventory.
+        LLFloaterReg::showInstance("build", "Content");
+        return TRUE;
+    }
+    else
+    {
+        // Nothing selected means the first mouse click was probably
+        // bad, so try again.
+        return FALSE;
+    }
 }
 
 void LLToolIndividual::handleSelect()
 {
-	const BOOL children_ok = TRUE;
-	LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
-	LLSelectMgr::getInstance()->deselectAll();
-	if(obj)
-	{
-		LLSelectMgr::getInstance()->selectObjectOnly(obj);
-	}
+    const BOOL children_ok = TRUE;
+    LLViewerObject* obj = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(children_ok);
+    LLSelectMgr::getInstance()->deselectAll();
+    if(obj)
+    {
+        LLSelectMgr::getInstance()->selectObjectOnly(obj);
+    }
 }
 
 ///----------------------------------------------------------------------------