Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev

1 files changed, 25 insertions, 25 deletions

diff --git a/indra/newview/llfloaterbuy.h b/indra/newview/llfloaterbuy.h
index fedbdce965..8c8a3efc64 100644
--- a/indra/newview/llfloaterbuy.h
+++ b/indra/newview/llfloaterbuy.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * @file llfloaterbuy.h
  * @author James Cook
  * @brief LLFloaterBuy class definition
@@ -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$
  */
@@ -28,7 +28,7 @@
 /**
  * Floater that appears when buying an object, giving a preview
  * of its contents and their permissions.
- */ 
+ */
 
 #ifndef LL_LLFLOATERBUY_H
 #define LL_LLFLOATERBUY_H
@@ -46,33 +46,33 @@ class LLFloaterBuy
 : public LLFloater, public LLVOInventoryListener
 {
 public:
-	LLFloaterBuy(const LLSD& key);
-	~LLFloaterBuy();
-	
-	bool postBuild() override;
-	void onClose(bool app_quitting) override;
-	
-	static void show(const LLSaleInfo& sale_info);
+    LLFloaterBuy(const LLSD& key);
+    ~LLFloaterBuy();
+
+    bool postBuild() override;
+    void onClose(bool app_quitting) override;
+
+    static void show(const LLSaleInfo& sale_info);
 
 protected:
-	void reset();
+    void reset();
 
-	void inventoryChanged(LLViewerObject* obj,
-		LLInventoryObject::object_list_t* inv,
-		S32 serial_num,
-		void* data) override;
+    void inventoryChanged(LLViewerObject* obj,
+        LLInventoryObject::object_list_t* inv,
+        S32 serial_num,
+        void* data) override;
 
-	void onSelectionChanged();
-	void showViews(bool show);
+    void onSelectionChanged();
+    void showViews(bool show);
 
-	void onClickBuy();
-	void onClickCancel();
+    void onClickBuy();
+    void onClickCancel();
 
 private:
-	LLSafeHandle<LLObjectSelection>	mObjectSelection;
-	LLSaleInfo mSaleInfo;
+    LLSafeHandle<LLObjectSelection> mObjectSelection;
+    LLSaleInfo mSaleInfo;
 
-	boost::signals2::connection mSelectionUpdateSlot;
+    boost::signals2::connection mSelectionUpdateSlot;
 };
 
 #endif