Merge main into inventory_favorites

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

1 files changed, 23 insertions, 23 deletions

diff --git a/indra/llmessage/tests/llcurl_stub.cpp b/indra/llmessage/tests/llcurl_stub.cpp
index 1c571a74da..78c195580c 100644
--- a/indra/llmessage/tests/llcurl_stub.cpp
+++ b/indra/llmessage/tests/llcurl_stub.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2008&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$
  */
@@ -38,18 +38,18 @@ LLCurl::Responder::Responder()
 
 void LLCurl::Responder::httpCompleted()
 {
-	if (isGoodStatus())
-	{
-		httpSuccess();
-	}
-	else
-	{
-		httpFailure();
-	}
+    if (isGoodStatus())
+    {
+        httpSuccess();
+    }
+    else
+    {
+        httpFailure();
+    }
 }
 
 void LLCurl::Responder::completedRaw(LLChannelDescriptors const&,
-									 std::shared_ptr<LLBufferArray> const&)
+                                     std::shared_ptr<LLBufferArray> const&)
 {
 }
 
@@ -67,33 +67,33 @@ void LLCurl::Responder::httpSuccess()
 
 std::string LLCurl::Responder::dumpResponse() const
 {
-	return "dumpResponse()";
+    return "dumpResponse()";
 }
 
 void LLCurl::Responder::successResult(const LLSD& content)
 {
-	setResult(HTTP_OK, "", content);
-	httpSuccess();
+    setResult(HTTP_OK, "", content);
+    httpSuccess();
 }
 
 void LLCurl::Responder::failureResult(S32 status, const std::string& reason, const LLSD& content)
 {
-	setResult(status, reason, content);
-	httpFailure();
+    setResult(status, reason, content);
+    httpFailure();
 }
 
 
 void LLCurl::Responder::completeResult(S32 status, const std::string& reason, const LLSD& content)
 {
-	setResult(status, reason, content);
-	httpCompleted();
+    setResult(status, reason, content);
+    httpCompleted();
 }
 
 void LLCurl::Responder::setResult(S32 status, const std::string& reason, const LLSD& content /* = LLSD() */)
 {
-	mStatus = status;
-	mReason = reason;
-	mContent = content;
+    mStatus = status;
+    mReason = reason;
+    mContent = content;
 }
 
 #endif