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

1 files changed, 24 insertions, 24 deletions

diff --git a/indra/newview/llwearablelist.h b/indra/newview/llwearablelist.h
index 782f7751e5..be00c058a2 100644
--- a/indra/newview/llwearablelist.h
+++ b/indra/newview/llwearablelist.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llwearablelist.h
  * @brief LLWearableList 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$
  */
@@ -33,38 +33,38 @@
 #include "llassetstorage.h"
 
 // Globally constructed; be careful that there's no dependency with gAgent.
-/* 
+/*
    BUG: mList's system of mapping between assetIDs and wearables is flawed
-   since LLWearable* has an associated itemID, and you can have multiple 
+   since LLWearable* has an associated itemID, and you can have multiple
    inventory items pointing to the same asset (i.e. more than one ItemID
    per assetID).  EXT-6252
 */
 class LLWearableList : public LLSingleton<LLWearableList>
 {
-	LLSINGLETON_EMPTY_CTOR(LLWearableList);
-	~LLWearableList();
+    LLSINGLETON_EMPTY_CTOR(LLWearableList);
+    ~LLWearableList();
 public:
-	void cleanup() ;
+    void cleanup() ;
+
+    S32                 getLength() const { return mList.size(); }
 
-	S32					getLength() const { return mList.size(); }
+    void                getAsset(const LLAssetID& assetID,
+                                 const std::string& wearable_name,
+                                 LLAvatarAppearance *avatarp,
+                                 LLAssetType::EType asset_type,
+                                 void(*asset_arrived_callback)(LLViewerWearable*, void* userdata),
+                                 void* userdata);
 
-	void				getAsset(const LLAssetID& assetID,
-								 const std::string& wearable_name,
-								 LLAvatarAppearance *avatarp,
-								 LLAssetType::EType asset_type,
-								 void(*asset_arrived_callback)(LLViewerWearable*, void* userdata),
-								 void* userdata);
+    LLViewerWearable*           createCopy(const LLViewerWearable* old_wearable, const std::string& new_name = std::string());
+    LLViewerWearable*           createNewWearable(LLWearableType::EType type, LLAvatarAppearance *avatarp);
 
-	LLViewerWearable*			createCopy(const LLViewerWearable* old_wearable, const std::string& new_name = std::string());
-	LLViewerWearable*			createNewWearable(LLWearableType::EType type, LLAvatarAppearance *avatarp);
-	
-	// Callback
-	static void	 	    processGetAssetReply(const char* filename, const LLAssetID& assetID, void* user_data, S32 status, LLExtStat ext_status);
+    // Callback
+    static void         processGetAssetReply(const char* filename, const LLAssetID& assetID, void* user_data, S32 status, LLExtStat ext_status);
 
 protected:
-	LLViewerWearable* generateNewWearable(); // used for the create... functions
+    LLViewerWearable* generateNewWearable(); // used for the create... functions
 private:
-	std::map<LLUUID, LLViewerWearable*> mList;
+    std::map<LLUUID, LLViewerWearable*> mList;
 };
 
 #endif  // LL_LLWEARABLELIST_H