Merge main into inventory_favorites

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

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/llcorehttp/httpoptions.cpp b/indra/llcorehttp/httpoptions.cpp
index c6365e5091..d85f6039b1 100644
--- a/indra/llcorehttp/httpoptions.cpp
+++ b/indra/llcorehttp/httpoptions.cpp
@@ -57,66 +57,66 @@ HttpOptions::~HttpOptions()
 
 void HttpOptions::setWantHeaders(bool wanted)
 {
-	mWantHeaders = wanted;
+    mWantHeaders = wanted;
 }
 
 
 void HttpOptions::setTrace(long level)
 {
-	mTracing = int(level);
+    mTracing = int(level);
 }
 
 
 void HttpOptions::setTimeout(unsigned int timeout)
 {
-	mTimeout = timeout;
+    mTimeout = timeout;
 }
 
 
 void HttpOptions::setTransferTimeout(unsigned int timeout)
 {
-	mTransferTimeout = timeout;
+    mTransferTimeout = timeout;
 }
 
 
 void HttpOptions::setRetries(unsigned int retries)
 {
-	mRetries = retries;
+    mRetries = retries;
 }
 
 void HttpOptions::setMinBackoff(HttpTime delay)
 {
-	mMinRetryBackoff = delay;
+    mMinRetryBackoff = delay;
 }
 
 void HttpOptions::setMaxBackoff(HttpTime delay)
 {
-	mMaxRetryBackoff = delay;
+    mMaxRetryBackoff = delay;
 }
 
 void HttpOptions::setUseRetryAfter(bool use_retry)
 {
-	mUseRetryAfter = use_retry;
+    mUseRetryAfter = use_retry;
 }
 
 void HttpOptions::setFollowRedirects(bool follow_redirect)
 {
-	mFollowRedirects = follow_redirect;
+    mFollowRedirects = follow_redirect;
 }
 
 void HttpOptions::setSSLVerifyPeer(bool verify)
 {
-	mVerifyPeer = verify;
+    mVerifyPeer = verify;
 }
 
 void HttpOptions::setSSLVerifyHost(bool verify)
 {
-	mVerifyHost = verify;
+    mVerifyHost = verify;
 }
 
 void HttpOptions::setDNSCacheTimeout(int timeout)
 {
-	mDNSCacheTimeout = timeout;
+    mDNSCacheTimeout = timeout;
 }
 
 void HttpOptions::setHeadersOnly(bool nobody)