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

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/newview/llfloaterbuycurrency.h b/indra/newview/llfloaterbuycurrency.h
index 88d3d17cd6..1b04c9c6d2 100644
--- a/indra/newview/llfloaterbuycurrency.h
+++ b/indra/newview/llfloaterbuycurrency.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llfloaterbuycurrency.h
  * @brief LLFloaterBuyCurrency class definition
  *
  * $LicenseInfo:firstyear=2005&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,15 +35,15 @@ class LLFloater;
 class LLFetchAvatarPaymentInfo : public LLAvatarPropertiesObserver
 {
 public:
-	LLFetchAvatarPaymentInfo(bool has_target, const std::string& name = std::string(), S32 price = 0);
-	~LLFetchAvatarPaymentInfo();
+    LLFetchAvatarPaymentInfo(bool has_target, const std::string& name = std::string(), S32 price = 0);
+    ~LLFetchAvatarPaymentInfo();
 
-	void processProperties(void* data, EAvatarProcessorType type);
+    void processProperties(void* data, EAvatarProcessorType type);
 
 private:
-	LLUUID mAvatarID;
-	bool mHasTarget;
-	std::string mName;
+    LLUUID mAvatarID;
+    bool mHasTarget;
+    std::string mName;
     S32 mPrice;
 };
 
@@ -51,20 +51,20 @@ private:
 class LLFloaterBuyCurrency
 {
 public:
-	static void buyCurrency();
-	static void buyCurrency(const std::string& name, S32 price);
+    static void buyCurrency();
+    static void buyCurrency(const std::string& name, S32 price);
+
+        static void handleBuyCurrency(bool has_piof, bool has_target, const std::string name, S32 price);
+        /* name should be a noun phrase of the object or service being bought:
+                "That object costs"
+                "Trying to give"
+                "Uploading costs"
+            a space and the price will be appended
+        */
 
-		static void handleBuyCurrency(bool has_piof, bool has_target, const std::string name, S32 price);
-		/* name should be a noun phrase of the object or service being bought:
-				"That object costs"
-				"Trying to give"
-				"Uploading costs"
-			a space and the price will be appended
-		*/
-	
-	static LLFloater* buildFloater(const LLSD& key);
+    static LLFloater* buildFloater(const LLSD& key);
 
-	static LLFetchAvatarPaymentInfo* sPropertiesRequest;
+    static LLFetchAvatarPaymentInfo* sPropertiesRequest;
 };
 
 #endif