Merge pull request #1476 from secondlife/marchcat/x-b-merge

Maint X -> Maint B merge

1 files changed, 31 insertions, 31 deletions

diff --git a/indra/newview/llfloaterauction.h b/indra/newview/llfloaterauction.h
index c83a11ba8b..3514d6cc3c 100644
--- a/indra/newview/llfloaterauction.h
+++ b/indra/newview/llfloaterauction.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterauction.h
  * @author James Cook, Ian Wilkes
  * @brief llfloaterauction class header file
@@ -6,21 +6,21 @@
  * $LicenseInfo:firstyear=2004&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$
  */
@@ -44,42 +44,42 @@ class LLViewerRegion;
 
 class LLFloaterAuction : public LLFloater
 {
-	friend class LLFloaterReg;
+    friend class LLFloaterReg;
 public:
-	// LLFloater interface
-	/*virtual*/ void onOpen(const LLSD& key);
-	/*virtual*/ void draw();
+    // LLFloater interface
+    /*virtual*/ void onOpen(const LLSD& key);
+    /*virtual*/ void draw();
 
 private:
-	
-	LLFloaterAuction(const LLSD& key);
-	~LLFloaterAuction();
-	
-	void initialize();
 
-	static void onClickSnapshot(void* data);
-	static void onClickResetParcel(void* data);
-	static void onClickSellToAnyone(void* data);		// Sell to anyone clicked
-	bool onSellToAnyoneConfirmed(const LLSD& notification, const LLSD& response);	// Sell confirmation clicked
-	static void onClickStartAuction(void* data);
+    LLFloaterAuction(const LLSD& key);
+    ~LLFloaterAuction();
+
+    void initialize();
+
+    static void onClickSnapshot(void* data);
+    static void onClickResetParcel(void* data);
+    static void onClickSellToAnyone(void* data);        // Sell to anyone clicked
+    bool onSellToAnyoneConfirmed(const LLSD& notification, const LLSD& response);   // Sell confirmation clicked
+    static void onClickStartAuction(void* data);
 
-	/*virtual*/ BOOL postBuild();
+    /*virtual*/ BOOL postBuild();
 
-	void doResetParcel();
-	void doSellToAnyone();
-	void clearParcelAccessList( LLParcel* parcel, LLViewerRegion* region, U32 list);
-	void cleanupAndClose();
+    void doResetParcel();
+    void doSellToAnyone();
+    void clearParcelAccessList( LLParcel* parcel, LLViewerRegion* region, U32 list);
+    void cleanupAndClose();
 
 private:
 
-	LLTransactionID mTransactionID;
-	LLAssetID mImageID;
-	LLPointer<LLViewerTexture> mImage;
-	LLSafeHandle<LLParcelSelection> mParcelp;
-	S32 mParcelID;
-	LLHost mParcelHost;
+    LLTransactionID mTransactionID;
+    LLAssetID mImageID;
+    LLPointer<LLViewerTexture> mImage;
+    LLSafeHandle<LLParcelSelection> mParcelp;
+    S32 mParcelID;
+    LLHost mParcelHost;
 
-	std::string mParcelUpdateCapUrl;	// "ParcelPropertiesUpdate" capability
+    std::string mParcelUpdateCapUrl;    // "ParcelPropertiesUpdate" capability
 };