Merge main into inventory_favorites

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

1 files changed, 67 insertions, 67 deletions

diff --git a/indra/llmessage/llpacketack.h b/indra/llmessage/llpacketack.h
index f0ed923f19..b60861eac7 100644
--- a/indra/llmessage/llpacketack.h
+++ b/indra/llmessage/llpacketack.h
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpacketack.h
  * @brief Reliable UDP helpers for the message system.
  *
  * $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,83 +33,83 @@
 class LLReliablePacketParams
 {
 public:
-	LLHost mHost;
-	S32 mRetries;
-	BOOL mPingBasedRetry;
-	F32Seconds mTimeout;
-	void (*mCallback)(void **,S32);
-	void** mCallbackData;
-	char* mMessageName;
+    LLHost mHost;
+    S32 mRetries;
+    BOOL mPingBasedRetry;
+    F32Seconds mTimeout;
+    void (*mCallback)(void **,S32);
+    void** mCallbackData;
+    char* mMessageName;
 
 public:
-	LLReliablePacketParams()
-	{
-		clear();
-	};
+    LLReliablePacketParams()
+    {
+        clear();
+    };
 
-	~LLReliablePacketParams() { };
+    ~LLReliablePacketParams() { };
 
-	void clear()
-	{
-		mHost.invalidate();
-		mRetries = 0;
-		mPingBasedRetry = TRUE;
-		mTimeout = F32Seconds(0.f);
-		mCallback = NULL;
-		mCallbackData = NULL;
-		mMessageName = NULL;
-	};
+    void clear()
+    {
+        mHost.invalidate();
+        mRetries = 0;
+        mPingBasedRetry = TRUE;
+        mTimeout = F32Seconds(0.f);
+        mCallback = NULL;
+        mCallbackData = NULL;
+        mMessageName = NULL;
+    };
 
-	void set(
-		const LLHost& host,
-		S32 retries,
-		BOOL ping_based_retry,
-		F32Seconds timeout, 
-		void (*callback)(void**,S32),
-		void** callback_data, char* name)
-	{
-		mHost = host;
-		mRetries = retries;
-		mPingBasedRetry = ping_based_retry;
-		mTimeout = timeout;
-		mCallback = callback;
-		mCallbackData = callback_data;
-		mMessageName = name;
-	};
+    void set(
+        const LLHost& host,
+        S32 retries,
+        BOOL ping_based_retry,
+        F32Seconds timeout,
+        void (*callback)(void**,S32),
+        void** callback_data, char* name)
+    {
+        mHost = host;
+        mRetries = retries;
+        mPingBasedRetry = ping_based_retry;
+        mTimeout = timeout;
+        mCallback = callback;
+        mCallbackData = callback_data;
+        mMessageName = name;
+    };
 };
 
 class LLReliablePacket
 {
 public:
-	LLReliablePacket(
-		S32 socket,
-		U8* buf_ptr,
-		S32 buf_len,
-		LLReliablePacketParams* params);
-	~LLReliablePacket()
-	{ 
-		mCallback = NULL;
-		delete [] mBuffer;
-		mBuffer = NULL;
-	};
+    LLReliablePacket(
+        S32 socket,
+        U8* buf_ptr,
+        S32 buf_len,
+        LLReliablePacketParams* params);
+    ~LLReliablePacket()
+    {
+        mCallback = NULL;
+        delete [] mBuffer;
+        mBuffer = NULL;
+    };
 
-	friend class LLCircuitData;
+    friend class LLCircuitData;
 protected:
-	S32 mSocket;
-	LLHost mHost;
-	S32 mRetries;
-	BOOL mPingBasedRetry;
-	F32Seconds mTimeout;
-	void (*mCallback)(void**,S32);
-	void** mCallbackData;
-	char* mMessageName;
+    S32 mSocket;
+    LLHost mHost;
+    S32 mRetries;
+    BOOL mPingBasedRetry;
+    F32Seconds mTimeout;
+    void (*mCallback)(void**,S32);
+    void** mCallbackData;
+    char* mMessageName;
 
-	U8* mBuffer;
-	S32 mBufferLength;
+    U8* mBuffer;
+    S32 mBufferLength;
 
-	TPACKETID mPacketID;
+    TPACKETID mPacketID;
 
-	F64Seconds mExpirationTime;
+    F64Seconds mExpirationTime;
 };
 
 #endif