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

Maint X -> Materials Featurette merge

1 files changed, 55 insertions, 55 deletions

diff --git a/indra/llinventory/llsaleinfo.h b/indra/llinventory/llsaleinfo.h
index 3c8952838b..961b6f4236 100644
--- a/indra/llinventory/llsaleinfo.h
+++ b/indra/llinventory/llsaleinfo.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llsaleinfo.h
  * @brief LLSaleInfo class header file.
  *
  * $LicenseInfo:firstyear=2002&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$
  */
@@ -43,73 +43,73 @@ class LLMessageSystem;
 class LLSaleInfo
 {
 public:
-	// use this to avoid temporary object creation
-	static const LLSaleInfo DEFAULT;
+    // use this to avoid temporary object creation
+    static const LLSaleInfo DEFAULT;
 
-	enum EForSale
-	{
-		// item is not to be considered for transactions
-		FS_NOT = 0,
+    enum EForSale
+    {
+        // item is not to be considered for transactions
+        FS_NOT = 0,
 
-		// the origional is on sale
-		FS_ORIGINAL = 1,
+        // the origional is on sale
+        FS_ORIGINAL = 1,
 
-		// A copy is for sale
-		FS_COPY = 2,
+        // A copy is for sale
+        FS_COPY = 2,
 
-		// Valid only for tasks, the inventory is for sale
-		// at the price in this structure.
-		FS_CONTENTS = 3,
+        // Valid only for tasks, the inventory is for sale
+        // at the price in this structure.
+        FS_CONTENTS = 3,
 
-		FS_COUNT
-	};
+        FS_COUNT
+    };
 
 protected:
-	EForSale mSaleType;
-	S32 mSalePrice;
+    EForSale mSaleType;
+    S32 mSalePrice;
 
 public:
-	// default constructor is fine usually
-	LLSaleInfo();
-	LLSaleInfo(EForSale sale_type, S32 sale_price);
+    // default constructor is fine usually
+    LLSaleInfo();
+    LLSaleInfo(EForSale sale_type, S32 sale_price);
 
-	// accessors
-	BOOL isForSale() const;
-	EForSale getSaleType() const { return mSaleType; }
-	S32 getSalePrice() const { return mSalePrice; }
-	U32 getCRC32() const;
+    // accessors
+    BOOL isForSale() const;
+    EForSale getSaleType() const { return mSaleType; }
+    S32 getSalePrice() const { return mSalePrice; }
+    U32 getCRC32() const;
 
-	// mutators
-	void setSaleType(EForSale type)		{ mSaleType = type; }
-	void setSalePrice(S32 price);
-	//void setNextOwnerPermMask(U32 mask)	{ mNextOwnerPermMask = mask; }
+    // mutators
+    void setSaleType(EForSale type)     { mSaleType = type; }
+    void setSalePrice(S32 price);
+    //void setNextOwnerPermMask(U32 mask)   { mNextOwnerPermMask = mask; }
 
-	BOOL exportLegacyStream(std::ostream& output_stream) const;
-	LLSD asLLSD() const;
-	operator LLSD() const { return asLLSD(); }
-	bool fromLLSD(const LLSD& sd, BOOL& has_perm_mask, U32& perm_mask);
-	BOOL importLegacyStream(std::istream& input_stream, BOOL& has_perm_mask, U32& perm_mask);
+    BOOL exportLegacyStream(std::ostream& output_stream) const;
+    LLSD asLLSD() const;
+    operator LLSD() const { return asLLSD(); }
+    bool fromLLSD(const LLSD& sd, BOOL& has_perm_mask, U32& perm_mask);
+    BOOL importLegacyStream(std::istream& input_stream, BOOL& has_perm_mask, U32& perm_mask);
 
-	LLSD packMessage() const;
-	void unpackMessage(LLSD sales);
+    LLSD packMessage() const;
+    void unpackMessage(LLSD sales);
 
-	// message serialization
-	void packMessage(LLMessageSystem* msg) const;
-	void unpackMessage(LLMessageSystem* msg, const char* block);
-	void unpackMultiMessage(LLMessageSystem* msg, const char* block,
-							S32 block_num);
+    // message serialization
+    void packMessage(LLMessageSystem* msg) const;
+    void unpackMessage(LLMessageSystem* msg, const char* block);
+    void unpackMultiMessage(LLMessageSystem* msg, const char* block,
+                            S32 block_num);
 
-	// static functionality for determine for sale status.
-	static EForSale lookup(const char* name);
-	static const char* lookup(EForSale type);
+    // static functionality for determine for sale status.
+    static EForSale lookup(const char* name);
+    static const char* lookup(EForSale type);
 
-	// Allow accumulation of sale info. The price of each is added,
-	// conflict in sale type results in FS_NOT, and the permissions
-	// are tightened.
-	void accumulate(const LLSaleInfo& sale_info);
+    // Allow accumulation of sale info. The price of each is added,
+    // conflict in sale type results in FS_NOT, and the permissions
+    // are tightened.
+    void accumulate(const LLSaleInfo& sale_info);
 
-	bool operator==(const LLSaleInfo &rhs) const;
-	bool operator!=(const LLSaleInfo &rhs) const;
+    bool operator==(const LLSaleInfo &rhs) const;
+    bool operator!=(const LLSaleInfo &rhs) const;
 };
 
 // These functions convert between structured data and sale info as