Merge main into inventory_favorites

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

1 files changed, 97 insertions, 97 deletions

diff --git a/indra/llcorehttp/_httppolicyglobal.cpp b/indra/llcorehttp/_httppolicyglobal.cpp
index 8da6cba6d0..431df6ba64 100644
--- a/indra/llcorehttp/_httppolicyglobal.cpp
+++ b/indra/llcorehttp/_httppolicyglobal.cpp
@@ -34,9 +34,9 @@ namespace LLCore
 
 
 HttpPolicyGlobal::HttpPolicyGlobal()
-	: mConnectionLimit(HTTP_CONNECTION_LIMIT_DEFAULT),
-	  mTrace(HTTP_TRACE_OFF),
-	  mUseLLProxy(0)
+    : mConnectionLimit(HTTP_CONNECTION_LIMIT_DEFAULT),
+      mTrace(HTTP_TRACE_OFF),
+      mUseLLProxy(0)
 {}
 
 
@@ -46,145 +46,145 @@ HttpPolicyGlobal::~HttpPolicyGlobal()
 
 HttpPolicyGlobal & HttpPolicyGlobal::operator=(const HttpPolicyGlobal & other)
 {
-	if (this != &other)
-	{
-		mConnectionLimit = other.mConnectionLimit;
-		mCAPath = other.mCAPath;
-		mCAFile = other.mCAFile;
-		mHttpProxy = other.mHttpProxy;
-		mTrace = other.mTrace;
-		mUseLLProxy = other.mUseLLProxy;
-	}
-	return *this;
+    if (this != &other)
+    {
+        mConnectionLimit = other.mConnectionLimit;
+        mCAPath = other.mCAPath;
+        mCAFile = other.mCAFile;
+        mHttpProxy = other.mHttpProxy;
+        mTrace = other.mTrace;
+        mUseLLProxy = other.mUseLLProxy;
+    }
+    return *this;
 }
 
 
 HttpStatus HttpPolicyGlobal::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_TRACE:
-		mTrace = llclamp(value, long(HTTP_TRACE_MIN), long(HTTP_TRACE_MAX));
-		break;
+    case HttpRequest::PO_TRACE:
+        mTrace = llclamp(value, long(HTTP_TRACE_MIN), long(HTTP_TRACE_MAX));
+        break;
 
-	case HttpRequest::PO_LLPROXY:
-		mUseLLProxy = llclamp(value, 0L, 1L);
-		break;
+    case HttpRequest::PO_LLPROXY:
+        mUseLLProxy = llclamp(value, 0L, 1L);
+        break;
 
-	default:
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
+    default:
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
 
-	return HttpStatus();
+    return HttpStatus();
 }
 
 
 HttpStatus HttpPolicyGlobal::set(HttpRequest::EPolicyOption opt, const std::string & value)
 {
-	switch (opt)
-	{
-	case HttpRequest::PO_CA_PATH:
+    switch (opt)
+    {
+    case HttpRequest::PO_CA_PATH:
         LL_DEBUGS("CoreHttp") << "Setting global CA Path to " << value << LL_ENDL;
-		mCAPath = value;
-		break;
+        mCAPath = value;
+        break;
 
-	case HttpRequest::PO_CA_FILE:
+    case HttpRequest::PO_CA_FILE:
         LL_DEBUGS("CoreHttp") << "Setting global CA File to " << value << LL_ENDL;
-		mCAFile = value;
-		break;
+        mCAFile = value;
+        break;
 
-	case HttpRequest::PO_HTTP_PROXY:
+    case HttpRequest::PO_HTTP_PROXY:
         LL_DEBUGS("CoreHttp") << "Setting global Proxy to " << value << LL_ENDL;
-		mHttpProxy = value;
-		break;
-
-	default:
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
-	
-	return HttpStatus();
+        mHttpProxy = value;
+        break;
+
+    default:
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
+
+    return HttpStatus();
 }
 
 HttpStatus HttpPolicyGlobal::set(HttpRequest::EPolicyOption opt, HttpRequest::policyCallback_t value)
 {
-	switch (opt)
-	{
-	case HttpRequest::PO_SSL_VERIFY_CALLBACK:
-		mSslCtxCallback = value;
-		break;
+    switch (opt)
+    {
+    case HttpRequest::PO_SSL_VERIFY_CALLBACK:
+        mSslCtxCallback = value;
+        break;
 
-	default:
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
+    default:
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
 
-	return HttpStatus();
+    return HttpStatus();
 }
 
 HttpStatus HttpPolicyGlobal::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_TRACE:
-		*value = mTrace;
-		break;
+    case HttpRequest::PO_TRACE:
+        *value = mTrace;
+        break;
 
-	case HttpRequest::PO_LLPROXY:
-		*value = mUseLLProxy;
-		break;
+    case HttpRequest::PO_LLPROXY:
+        *value = mUseLLProxy;
+        break;
 
-	default:
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
+    default:
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
 
-	return HttpStatus();
+    return HttpStatus();
 }
 
 
 HttpStatus HttpPolicyGlobal::get(HttpRequest::EPolicyOption opt, std::string * value) const
 {
-	switch (opt)
-	{
-	case HttpRequest::PO_CA_PATH:
-		*value = mCAPath;
-		break;
-
-	case HttpRequest::PO_CA_FILE:
-		*value = mCAFile;
-		break;
-
-	case HttpRequest::PO_HTTP_PROXY:
-		*value = mHttpProxy;
-		break;
-
-	default:
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
-	
-	return HttpStatus();
+    switch (opt)
+    {
+    case HttpRequest::PO_CA_PATH:
+        *value = mCAPath;
+        break;
+
+    case HttpRequest::PO_CA_FILE:
+        *value = mCAFile;
+        break;
+
+    case HttpRequest::PO_HTTP_PROXY:
+        *value = mHttpProxy;
+        break;
+
+    default:
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
+
+    return HttpStatus();
 }
 
 
 HttpStatus HttpPolicyGlobal::get(HttpRequest::EPolicyOption opt, HttpRequest::policyCallback_t * value) const
 {
-	switch (opt)
-	{
-	case HttpRequest::PO_SSL_VERIFY_CALLBACK:
-		*value = mSslCtxCallback;
-		break;
+    switch (opt)
+    {
+    case HttpRequest::PO_SSL_VERIFY_CALLBACK:
+        *value = mSslCtxCallback;
+        break;
 
-	default:
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
+    default:
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
 
-	return HttpStatus();
+    return HttpStatus();
 }
 
 }  // end namespace LLCore