Merge main into inventory_favorites

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

1 files changed, 52 insertions, 52 deletions

diff --git a/indra/llcorehttp/_httppolicyclass.cpp b/indra/llcorehttp/_httppolicyclass.cpp
index 2c0f650155..811b004032 100644
--- a/indra/llcorehttp/_httppolicyclass.cpp
+++ b/indra/llcorehttp/_httppolicyclass.cpp
@@ -34,10 +34,10 @@ namespace LLCore
 
 
 HttpPolicyClass::HttpPolicyClass()
-	: mConnectionLimit(HTTP_CONNECTION_LIMIT_DEFAULT),
-	  mPerHostConnectionLimit(HTTP_CONNECTION_LIMIT_DEFAULT),
-	  mPipelining(HTTP_PIPELINING_DEFAULT),
-	  mThrottleRate(HTTP_THROTTLE_RATE_DEFAULT)
+    : mConnectionLimit(HTTP_CONNECTION_LIMIT_DEFAULT),
+      mPerHostConnectionLimit(HTTP_CONNECTION_LIMIT_DEFAULT),
+      mPipelining(HTTP_PIPELINING_DEFAULT),
+      mThrottleRate(HTTP_THROTTLE_RATE_DEFAULT)
 {}
 
 
@@ -47,78 +47,78 @@ HttpPolicyClass::~HttpPolicyClass()
 
 HttpPolicyClass & HttpPolicyClass::operator=(const HttpPolicyClass & other)
 {
-	if (this != &other)
-	{
-		mConnectionLimit = other.mConnectionLimit;
-		mPerHostConnectionLimit = other.mPerHostConnectionLimit;
-		mPipelining = other.mPipelining;
-		mThrottleRate = other.mThrottleRate;
-	}
-	return *this;
+    if (this != &other)
+    {
+        mConnectionLimit = other.mConnectionLimit;
+        mPerHostConnectionLimit = other.mPerHostConnectionLimit;
+        mPipelining = other.mPipelining;
+        mThrottleRate = other.mThrottleRate;
+    }
+    return *this;
 }
 
 
 HttpPolicyClass::HttpPolicyClass(const HttpPolicyClass & other)
-	: mConnectionLimit(other.mConnectionLimit),
-	  mPerHostConnectionLimit(other.mPerHostConnectionLimit),
-	  mPipelining(other.mPipelining),
-	  mThrottleRate(other.mThrottleRate)
+    : mConnectionLimit(other.mConnectionLimit),
+      mPerHostConnectionLimit(other.mPerHostConnectionLimit),
+      mPipelining(other.mPipelining),
+      mThrottleRate(other.mThrottleRate)
 {}
 
 
 HttpStatus HttpPolicyClass::set(HttpRequest::EPolicyOption opt, long value)
 {
-	switch (opt)
-	{
-	case HttpRequest::PO_CONNECTION_LIMIT:
-		mConnectionLimit = llclamp(value, long(HTTP_CONNECTION_LIMIT_MIN), long(HTTP_CONNECTION_LIMIT_MAX));
-		break;
+    switch (opt)
+    {
+    case HttpRequest::PO_CONNECTION_LIMIT:
+        mConnectionLimit = llclamp(value, long(HTTP_CONNECTION_LIMIT_MIN), long(HTTP_CONNECTION_LIMIT_MAX));
+        break;
 
-	case HttpRequest::PO_PER_HOST_CONNECTION_LIMIT:
-		mPerHostConnectionLimit = llclamp(value, long(HTTP_CONNECTION_LIMIT_MIN), mConnectionLimit);
-		break;
+    case HttpRequest::PO_PER_HOST_CONNECTION_LIMIT:
+        mPerHostConnectionLimit = llclamp(value, long(HTTP_CONNECTION_LIMIT_MIN), mConnectionLimit);
+        break;
 
-	case HttpRequest::PO_PIPELINING_DEPTH:
-		mPipelining = llclamp(value, 0L, HTTP_PIPELINING_MAX);
-		break;
+    case HttpRequest::PO_PIPELINING_DEPTH:
+        mPipelining = llclamp(value, 0L, HTTP_PIPELINING_MAX);
+        break;
 
-	case HttpRequest::PO_THROTTLE_RATE:
-		mThrottleRate = llclamp(value, 0L, 1000000L);
-		break;
+    case HttpRequest::PO_THROTTLE_RATE:
+        mThrottleRate = llclamp(value, 0L, 1000000L);
+        break;
 
-	default:
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
+    default:
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
 
-	return HttpStatus();
+    return HttpStatus();
 }
 
 
 HttpStatus HttpPolicyClass::get(HttpRequest::EPolicyOption opt, long * value) const
 {
-	switch (opt)
-	{
-	case HttpRequest::PO_CONNECTION_LIMIT:
-		*value = mConnectionLimit;
-		break;
+    switch (opt)
+    {
+    case HttpRequest::PO_CONNECTION_LIMIT:
+        *value = mConnectionLimit;
+        break;
 
-	case HttpRequest::PO_PER_HOST_CONNECTION_LIMIT:
-		*value = mPerHostConnectionLimit;
-		break;
+    case HttpRequest::PO_PER_HOST_CONNECTION_LIMIT:
+        *value = mPerHostConnectionLimit;
+        break;
 
-	case HttpRequest::PO_PIPELINING_DEPTH:
-		*value = mPipelining;
-		break;
+    case HttpRequest::PO_PIPELINING_DEPTH:
+        *value = mPipelining;
+        break;
 
-	case HttpRequest::PO_THROTTLE_RATE:
-		*value = mThrottleRate;
-		break;
+    case HttpRequest::PO_THROTTLE_RATE:
+        *value = mThrottleRate;
+        break;
 
-	default:
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
+    default:
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
 
-	return HttpStatus();
+    return HttpStatus();
 }