Merge main into inventory_favorites

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

1 files changed, 13 insertions, 13 deletions

diff --git a/indra/llcorehttp/_httppolicyclass.h b/indra/llcorehttp/_httppolicyclass.h
index 38f1194ded..32bcad4f9c 100644
--- a/indra/llcorehttp/_httppolicyclass.h
+++ b/indra/llcorehttp/_httppolicyclass.h
@@ -24,8 +24,8 @@
  * $/LicenseInfo$
  */
 
-#ifndef	_LLCORE_HTTP_POLICY_CLASS_H_
-#define	_LLCORE_HTTP_POLICY_CLASS_H_
+#ifndef _LLCORE_HTTP_POLICY_CLASS_H_
+#define _LLCORE_HTTP_POLICY_CLASS_H_
 
 
 #include "httprequest.h"
@@ -49,21 +49,21 @@ namespace LLCore
 class HttpPolicyClass
 {
 public:
-	HttpPolicyClass();
-	~HttpPolicyClass();
+    HttpPolicyClass();
+    ~HttpPolicyClass();
 
-	HttpPolicyClass & operator=(const HttpPolicyClass &);
-	HttpPolicyClass(const HttpPolicyClass &);			// Not defined
+    HttpPolicyClass & operator=(const HttpPolicyClass &);
+    HttpPolicyClass(const HttpPolicyClass &);           // Not defined
 
 public:
-	HttpStatus set(HttpRequest::EPolicyOption opt, long value);
-	HttpStatus get(HttpRequest::EPolicyOption opt, long * value) const;
-	
+    HttpStatus set(HttpRequest::EPolicyOption opt, long value);
+    HttpStatus get(HttpRequest::EPolicyOption opt, long * value) const;
+
 public:
-	long						mConnectionLimit;
-	long						mPerHostConnectionLimit;
-	long						mPipelining;
-	long						mThrottleRate;
+    long                        mConnectionLimit;
+    long                        mPerHostConnectionLimit;
+    long                        mPipelining;
+    long                        mThrottleRate;
 };  // end class HttpPolicyClass
 
 }  // end namespace LLCore