Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 37 insertions, 37 deletions

diff --git a/indra/llmessage/llxfer_file.h b/indra/llmessage/llxfer_file.h
index ab9374549e..cb2da47e44 100644
--- a/indra/llmessage/llxfer_file.h
+++ b/indra/llmessage/llxfer_file.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llxfer_file.h
  * @brief definition of LLXfer_File class for a single xfer_file.
  *
  * $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$
  */
@@ -33,50 +33,50 @@
 class LLXfer_File : public LLXfer
 {
  protected:
- 	LLFILE *mFp;
-	std::string mLocalFilename;
-	std::string mRemoteFilename;
-	ELLPath mRemotePath;
-	std::string mTempFilename;
+    LLFILE *mFp;
+    std::string mLocalFilename;
+    std::string mRemoteFilename;
+    ELLPath mRemotePath;
+    std::string mTempFilename;
 
-	BOOL mDeleteLocalOnCompletion;
-	BOOL mDeleteRemoteOnCompletion;
+    BOOL mDeleteLocalOnCompletion;
+    BOOL mDeleteRemoteOnCompletion;
 
  public:
-	LLXfer_File (S32 chunk_size);
-	LLXfer_File (const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
-	virtual ~LLXfer_File();
+    LLXfer_File (S32 chunk_size);
+    LLXfer_File (const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
+    virtual ~LLXfer_File();
 
-	virtual void init(const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
-	virtual void cleanup();
+    virtual void init(const std::string& local_filename, BOOL delete_local_on_completion, S32 chunk_size);
+    virtual void cleanup();
 
-	virtual S32 initializeRequest(U64 xfer_id,
-								  const std::string& local_filename,
-								  const std::string& remote_filename,
-								  ELLPath remote_path,
-								  const LLHost& remote_host,
-								  BOOL delete_remote_on_completion,
-								  void (*callback)(void**,S32,LLExtStat),
-								  void** user_data);
-	virtual S32 startDownload();
+    virtual S32 initializeRequest(U64 xfer_id,
+                                  const std::string& local_filename,
+                                  const std::string& remote_filename,
+                                  ELLPath remote_path,
+                                  const LLHost& remote_host,
+                                  BOOL delete_remote_on_completion,
+                                  void (*callback)(void**,S32,LLExtStat),
+                                  void** user_data);
+    virtual S32 startDownload();
 
-	virtual S32 processEOF();
+    virtual S32 processEOF();
 
-	virtual S32 startSend(U64 xfer_id, const LLHost &remote_host);
-	virtual void closeFileHandle();
-	virtual S32 reopenFileHandle();
+    virtual S32 startSend(U64 xfer_id, const LLHost &remote_host);
+    virtual void closeFileHandle();
+    virtual S32 reopenFileHandle();
 
-	virtual S32 suck(S32 start_position);
-	virtual S32 flush();
+    virtual S32 suck(S32 start_position);
+    virtual S32 flush();
 
-	virtual BOOL matchesLocalFilename(const std::string& filename);
-	virtual BOOL matchesRemoteFilename(const std::string& filename, ELLPath remote_path);
+    virtual BOOL matchesLocalFilename(const std::string& filename);
+    virtual BOOL matchesRemoteFilename(const std::string& filename, ELLPath remote_path);
 
-	virtual S32  getMaxBufferSize();
+    virtual S32  getMaxBufferSize();
 
-	virtual U32 getXferTypeTag();
+    virtual U32 getXferTypeTag();
 
-	virtual std::string getFileName();
+    virtual std::string getFileName();
 };
 
 #endif