Merge pull request #1478 from secondlife/marchcat/x-mf-merge

Maint X -> Materials Featurette merge

1 files changed, 29 insertions, 29 deletions

diff --git a/indra/newview/llparcelselection.h b/indra/newview/llparcelselection.h
index 06d9141efb..ba2241bc40 100644
--- a/indra/newview/llparcelselection.h
+++ b/indra/newview/llparcelselection.h
@@ -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$
  */
@@ -34,44 +34,44 @@ class LLParcel;
 
 class LLParcelSelection : public LLRefCount
 {
-	friend class LLViewerParcelMgr;
-	friend class LLSafeHandle<LLParcelSelection>;
+    friend class LLViewerParcelMgr;
+    friend class LLSafeHandle<LLParcelSelection>;
 
 protected:
-	~LLParcelSelection();
+    ~LLParcelSelection();
 
 public:
-	LLParcelSelection(LLParcel* parcel);
-	LLParcelSelection();
+    LLParcelSelection(LLParcel* parcel);
+    LLParcelSelection();
 
-	// this can return NULL at any time, as parcel selection
-	// might have been invalidated.
-	LLParcel* getParcel() { return mParcel; }
+    // this can return NULL at any time, as parcel selection
+    // might have been invalidated.
+    LLParcel* getParcel() { return mParcel; }
 
-	// Return the number of grid units that are owned by you within
-	// the selection (computed by server).
-	S32 getSelfCount() const { return mSelectedSelfCount; }
+    // Return the number of grid units that are owned by you within
+    // the selection (computed by server).
+    S32 getSelfCount() const { return mSelectedSelfCount; }
 
-	// Returns area that will actually be claimed in meters squared.
-	S32		getClaimableArea() const;
-	bool	hasOthersSelected() const;
+    // Returns area that will actually be claimed in meters squared.
+    S32     getClaimableArea() const;
+    bool    hasOthersSelected() const;
 
-	// Does the selection have multiple land owners in it?
-	BOOL	getMultipleOwners() const;
+    // Does the selection have multiple land owners in it?
+    BOOL    getMultipleOwners() const;
 
-	// Is the entire parcel selected, or just a part?
-	BOOL	getWholeParcelSelected() const;
+    // Is the entire parcel selected, or just a part?
+    BOOL    getWholeParcelSelected() const;
 
 private:
-	void setParcel(LLParcel* parcel) { mParcel = parcel; }
+    void setParcel(LLParcel* parcel) { mParcel = parcel; }
 
 private:
-	LLParcel*	mParcel;
-	BOOL		mSelectedMultipleOwners;
-	BOOL		mWholeParcelSelected;
-	S32			mSelectedSelfCount;
-	S32			mSelectedOtherCount;
-	S32			mSelectedPublicCount;
+    LLParcel*   mParcel;
+    BOOL        mSelectedMultipleOwners;
+    BOOL        mWholeParcelSelected;
+    S32         mSelectedSelfCount;
+    S32         mSelectedOtherCount;
+    S32         mSelectedPublicCount;
 };
 
 typedef LLSafeHandle<LLParcelSelection> LLParcelSelectionHandle;