Merge commit 'e7eced3' into lua-timers for whitespace fixes.

1 files changed, 20 insertions, 20 deletions

diff --git a/indra/newview/llfloaterbuycontents.h b/indra/newview/llfloaterbuycontents.h
index 19393fb6af..c397b11400 100644
--- a/indra/newview/llfloaterbuycontents.h
+++ b/indra/newview/llfloaterbuycontents.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterbuycontents.h
  * @author James Cook
  * @brief LLFloaterBuyContents 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,25 +44,25 @@ class LLFloaterBuyContents
 : public LLFloater, public LLVOInventoryListener
 {
 public:
-	static void show(const LLSaleInfo& sale_info);
+    static void show(const LLSaleInfo& sale_info);
+
+    LLFloaterBuyContents(const LLSD& key);
+    ~LLFloaterBuyContents();
+    /*virtual*/ BOOL    postBuild();
 
-	LLFloaterBuyContents(const LLSD& key);
-	~LLFloaterBuyContents();
-	/*virtual*/	BOOL	postBuild();
-	
 protected:
-	void requestObjectInventories();
-	/*virtual*/ void inventoryChanged(LLViewerObject* obj,
-								 LLInventoryObject::object_list_t* inv,
-								 S32 serial_num,
-								 void* data);
-	
-	void onClickBuy();
-	void onClickCancel();
+    void requestObjectInventories();
+    /*virtual*/ void inventoryChanged(LLViewerObject* obj,
+                                 LLInventoryObject::object_list_t* inv,
+                                 S32 serial_num,
+                                 void* data);
+
+    void onClickBuy();
+    void onClickCancel();
 
 protected:
-	LLSafeHandle<LLObjectSelection> mObjectSelection;
-	LLSaleInfo mSaleInfo;
+    LLSafeHandle<LLObjectSelection> mObjectSelection;
+    LLSaleInfo mSaleInfo;
 };
 
 #endif