Merge main into inventory_favorites

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

1 files changed, 21 insertions, 21 deletions

diff --git a/indra/newview/llparcelselection.cpp b/indra/newview/llparcelselection.cpp
index 5c62159b93..12ac947dea 100644
--- a/indra/newview/llparcelselection.cpp
+++ b/indra/newview/llparcelselection.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2007&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,22 +35,22 @@
 // LLParcelSelection
 //
 LLParcelSelection::LLParcelSelection() :
-	mParcel(NULL),
-	mSelectedMultipleOwners(FALSE),
-	mWholeParcelSelected(FALSE),
-	mSelectedSelfCount(0),
-	mSelectedOtherCount(0),
-	mSelectedPublicCount(0)
+    mParcel(NULL),
+    mSelectedMultipleOwners(FALSE),
+    mWholeParcelSelected(FALSE),
+    mSelectedSelfCount(0),
+    mSelectedOtherCount(0),
+    mSelectedPublicCount(0)
 {
 }
 
 LLParcelSelection::LLParcelSelection(LLParcel* parcel)  :
-	mParcel(parcel),
-	mSelectedMultipleOwners(FALSE),
-	mWholeParcelSelected(FALSE),
-	mSelectedSelfCount(0),
-	mSelectedOtherCount(0),
-	mSelectedPublicCount(0)
+    mParcel(parcel),
+    mSelectedMultipleOwners(FALSE),
+    mWholeParcelSelected(FALSE),
+    mSelectedSelfCount(0),
+    mSelectedOtherCount(0),
+    mSelectedPublicCount(0)
 {
 }
 
@@ -60,23 +60,23 @@ LLParcelSelection::~LLParcelSelection()
 
 BOOL LLParcelSelection::getMultipleOwners() const
 {
-	return mSelectedMultipleOwners;
+    return mSelectedMultipleOwners;
 }
 
 
 BOOL LLParcelSelection::getWholeParcelSelected() const
 {
-	return mWholeParcelSelected;
+    return mWholeParcelSelected;
 }
 
 
 S32 LLParcelSelection::getClaimableArea() const
 {
-	const S32 UNIT_AREA = S32( PARCEL_GRID_STEP_METERS * PARCEL_GRID_STEP_METERS );
-	return mSelectedPublicCount * UNIT_AREA;
+    const S32 UNIT_AREA = S32( PARCEL_GRID_STEP_METERS * PARCEL_GRID_STEP_METERS );
+    return mSelectedPublicCount * UNIT_AREA;
 }
 
 bool LLParcelSelection::hasOthersSelected() const
 {
-	return mSelectedOtherCount != 0;
+    return mSelectedOtherCount != 0;
 }