Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A

# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GoogleMock.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.cpp
#	indra/llcharacter/llmultigesture.h
#	indra/llimage/llimage.cpp
#	indra/llimage/llimagepng.cpp
#	indra/llimage/llimageworker.cpp
#	indra/llimage/tests/llimageworker_test.cpp
#	indra/llmessage/tests/llmockhttpclient.h
#	indra/llprimitive/llgltfmaterial.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llui/llcombobox.cpp
#	indra/llui/llfolderview.cpp
#	indra/llui/llfolderviewmodel.h
#	indra/llui/lllineeditor.cpp
#	indra/llui/lllineeditor.h
#	indra/llui/lltextbase.cpp
#	indra/llui/lltextbase.h
#	indra/llui/lltexteditor.cpp
#	indra/llui/lltextvalidate.cpp
#	indra/llui/lltextvalidate.h
#	indra/llui/lluictrl.h
#	indra/llui/llview.cpp
#	indra/llwindow/llwindowmacosx.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappearancemgr.cpp
#	indra/newview/llappearancemgr.h
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llbreadcrumbview.cpp
#	indra/newview/llbreadcrumbview.h
#	indra/newview/llbreastmotion.cpp
#	indra/newview/llbreastmotion.h
#	indra/newview/llconversationmodel.h
#	indra/newview/lldensityctrl.cpp
#	indra/newview/lldensityctrl.h
#	indra/newview/llface.inl
#	indra/newview/llfloatereditsky.cpp
#	indra/newview/llfloatereditwater.cpp
#	indra/newview/llfloateremojipicker.h
#	indra/newview/llfloaterimsessiontab.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.cpp
#	indra/newview/llgesturemgr.h
#	indra/newview/llimpanel.cpp
#	indra/newview/llimpanel.h
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorybridge.h
#	indra/newview/llinventoryclipboard.cpp
#	indra/newview/llinventoryclipboard.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorygallery.cpp
#	indra/newview/lllistbrowser.cpp
#	indra/newview/lllistbrowser.h
#	indra/newview/llpanelobjectinventory.cpp
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llsavedsettingsglue.cpp
#	indra/newview/llsavedsettingsglue.h
#	indra/newview/lltooldraganddrop.cpp
#	indra/newview/llurllineeditorctrl.cpp
#	indra/newview/llvectorperfoptions.cpp
#	indra/newview/llvectorperfoptions.h
#	indra/newview/llviewerparceloverlay.cpp
#	indra/newview/llviewertexlayer.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/macmain.h
#	indra/test/test.cpp

1 files changed, 72 insertions, 72 deletions

diff --git a/indra/llcorehttp/_httpopsetget.cpp b/indra/llcorehttp/_httpopsetget.cpp
index a5363f9170..8caecd3e76 100644
--- a/indra/llcorehttp/_httpopsetget.cpp
+++ b/indra/llcorehttp/_httpopsetget.cpp
@@ -43,12 +43,12 @@ namespace LLCore
 
 
 HttpOpSetGet::HttpOpSetGet()
-	: HttpOperation(),
-	  mReqOption(HttpRequest::PO_CONNECTION_LIMIT),
-	  mReqClass(HttpRequest::INVALID_POLICY_ID),
-	  mReqDoSet(false),
-	  mReqLongValue(0L),
-	  mReplyLongValue(0L)
+    : HttpOperation(),
+      mReqOption(HttpRequest::PO_CONNECTION_LIMIT),
+      mReqClass(HttpRequest::INVALID_POLICY_ID),
+      mReqDoSet(false),
+      mReqLongValue(0L),
+      mReplyLongValue(0L)
 {}
 
 
@@ -58,89 +58,89 @@ HttpOpSetGet::~HttpOpSetGet()
 
 HttpStatus HttpOpSetGet::setupGet(HttpRequest::EPolicyOption opt, HttpRequest::policy_t pclass)
 {
-	HttpStatus status;
-	
-	mReqOption = opt;
-	mReqClass = pclass;
-	return status;
+    HttpStatus status;
+
+    mReqOption = opt;
+    mReqClass = pclass;
+    return status;
 }
 
 
 HttpStatus HttpOpSetGet::setupSet(HttpRequest::EPolicyOption opt, HttpRequest::policy_t pclass, long value)
 {
-	HttpStatus status;
-
-	if (! HttpService::sOptionDesc[opt].mIsLong)
-	{
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
-	if (! HttpService::sOptionDesc[opt].mIsDynamic)
-	{
-		return HttpStatus(HttpStatus::LLCORE, HE_OPT_NOT_DYNAMIC);
-	}
-	
-	mReqOption = opt;
-	mReqClass = pclass;
-	mReqDoSet = true;
-	mReqLongValue = value;
-	
-	return status;
+    HttpStatus status;
+
+    if (! HttpService::sOptionDesc[opt].mIsLong)
+    {
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
+    if (! HttpService::sOptionDesc[opt].mIsDynamic)
+    {
+        return HttpStatus(HttpStatus::LLCORE, HE_OPT_NOT_DYNAMIC);
+    }
+
+    mReqOption = opt;
+    mReqClass = pclass;
+    mReqDoSet = true;
+    mReqLongValue = value;
+
+    return status;
 }
 
 
 HttpStatus HttpOpSetGet::setupSet(HttpRequest::EPolicyOption opt, HttpRequest::policy_t pclass, const std::string & value)
 {
-	HttpStatus status;
-
-	if (HttpService::sOptionDesc[opt].mIsLong)
-	{
-		return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
-	}
-	if (! HttpService::sOptionDesc[opt].mIsDynamic)
-	{
-		return HttpStatus(HttpStatus::LLCORE, HE_OPT_NOT_DYNAMIC);
-	}
-
-	mReqOption = opt;
-	mReqClass = pclass;
-	mReqDoSet = true;
-	mReqStrValue = value;
-	
-	return status;
+    HttpStatus status;
+
+    if (HttpService::sOptionDesc[opt].mIsLong)
+    {
+        return HttpStatus(HttpStatus::LLCORE, HE_INVALID_ARG);
+    }
+    if (! HttpService::sOptionDesc[opt].mIsDynamic)
+    {
+        return HttpStatus(HttpStatus::LLCORE, HE_OPT_NOT_DYNAMIC);
+    }
+
+    mReqOption = opt;
+    mReqClass = pclass;
+    mReqDoSet = true;
+    mReqStrValue = value;
+
+    return status;
 }
 
 
 void HttpOpSetGet::stageFromRequest(HttpService * service)
 {
-	if (mReqDoSet)
-	{
-		if (HttpService::sOptionDesc[mReqOption].mIsLong)
-		{
-			mStatus = service->setPolicyOption(mReqOption, mReqClass,
-											   mReqLongValue, &mReplyLongValue);
-		}
-		else
-		{
-			mStatus = service->setPolicyOption(mReqOption, mReqClass,
-											   mReqStrValue, &mReplyStrValue);
-		}
-	}
-	else
-	{
-		if (HttpService::sOptionDesc[mReqOption].mIsLong)
-		{
-			mStatus = service->getPolicyOption(mReqOption, mReqClass, &mReplyLongValue);
-		}
-		else
-		{
-			mStatus = service->getPolicyOption(mReqOption, mReqClass, &mReplyStrValue);
-		}
-	}
-	
-	addAsReply();
+    if (mReqDoSet)
+    {
+        if (HttpService::sOptionDesc[mReqOption].mIsLong)
+        {
+            mStatus = service->setPolicyOption(mReqOption, mReqClass,
+                                               mReqLongValue, &mReplyLongValue);
+        }
+        else
+        {
+            mStatus = service->setPolicyOption(mReqOption, mReqClass,
+                                               mReqStrValue, &mReplyStrValue);
+        }
+    }
+    else
+    {
+        if (HttpService::sOptionDesc[mReqOption].mIsLong)
+        {
+            mStatus = service->getPolicyOption(mReqOption, mReqClass, &mReplyLongValue);
+        }
+        else
+        {
+            mStatus = service->getPolicyOption(mReqOption, mReqClass, &mReplyStrValue);
+        }
+    }
+
+    addAsReply();
 }
 
 
 }   // end namespace LLCore
 
-		
+