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/_httpopsetpriority.cpp b/indra/llcorehttp/_httpopsetpriority.cpp
index b99b4e9e4a..b62770e45a 100644
--- a/indra/llcorehttp/_httpopsetpriority.cpp
+++ b/indra/llcorehttp/_httpopsetpriority.cpp
@@ -37,9 +37,9 @@ namespace LLCore
 
 
 HttpOpSetPriority::HttpOpSetPriority(HttpHandle handle, HttpRequest::priority_t priority)
-	: HttpOperation(),
-	  mHandle(handle),
-	  mPriority(priority)
+    : HttpOperation(),
+      mHandle(handle),
+      mPriority(priority)
 {}
 
 
@@ -49,15 +49,15 @@ HttpOpSetPriority::~HttpOpSetPriority()
 
 void HttpOpSetPriority::stageFromRequest(HttpService * service)
 {
-	// Do operations
-	if (! service->changePriority(mHandle, mPriority))
-	{
-		// Request not found, fail the final status
-		mStatus = HttpStatus(HttpStatus::LLCORE, HE_HANDLE_NOT_FOUND);
-	}
-	
-	// Move directly to response queue
-	addAsReply();
+    // Do operations
+    if (! service->changePriority(mHandle, mPriority))
+    {
+        // Request not found, fail the final status
+        mStatus = HttpStatus(HttpStatus::LLCORE, HE_HANDLE_NOT_FOUND);
+    }
+
+    // Move directly to response queue
+    addAsReply();
 }