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

Maint X -> Materials Featurette merge

1 files changed, 25 insertions, 25 deletions

diff --git a/indra/llmessage/llxfer_mem.h b/indra/llmessage/llxfer_mem.h
index d07779de87..ef8e9e2483 100644
--- a/indra/llmessage/llxfer_mem.h
+++ b/indra/llmessage/llxfer_mem.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llxfer_mem.h
  * @brief definition of LLXfer_Mem class for a single xfer
  *
  * $LicenseInfo:firstyear=2001&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$
  */
@@ -36,37 +36,37 @@ class LLXfer_Mem : public LLXfer
 {
  private:
  protected:
-	void (*mCallback)(void *, S32, void **, S32, LLExtStat);	
-	std::string mRemoteFilename;
-	ELLPath mRemotePath;
-	BOOL mDeleteRemoteOnCompletion;
+    void (*mCallback)(void *, S32, void **, S32, LLExtStat);
+    std::string mRemoteFilename;
+    ELLPath mRemotePath;
+    BOOL mDeleteRemoteOnCompletion;
 
  public:
 
  private:
  protected:
  public:
-	LLXfer_Mem ();
-	virtual ~LLXfer_Mem();
+    LLXfer_Mem ();
+    virtual ~LLXfer_Mem();
 
-	virtual void init();
-	virtual void cleanup();
+    virtual void init();
+    virtual void cleanup();
 
-	virtual S32 startSend (U64 xfer_id, const LLHost &remote_host);
-	virtual void setXferSize (S32 data_size);
+    virtual S32 startSend (U64 xfer_id, const LLHost &remote_host);
+    virtual void setXferSize (S32 data_size);
 
-	virtual S32 initializeRequest(U64 xfer_id,
-								  const std::string& remote_filename,
-								  ELLPath remote_path,
-								  const LLHost& remote_host,
-								  BOOL delete_remote_on_completion,
-								  void (*callback)(void*,S32,void**,S32,LLExtStat),
-								  void** user_data);
-	virtual S32 startDownload();
+    virtual S32 initializeRequest(U64 xfer_id,
+                                  const std::string& remote_filename,
+                                  ELLPath remote_path,
+                                  const LLHost& remote_host,
+                                  BOOL delete_remote_on_completion,
+                                  void (*callback)(void*,S32,void**,S32,LLExtStat),
+                                  void** user_data);
+    virtual S32 startDownload();
 
-	virtual S32 processEOF();
+    virtual S32 processEOF();
 
-	virtual U32 getXferTypeTag();
+    virtual U32 getXferTypeTag();
 };
 
 #endif