Merge pull request #1477 from secondlife/marchcat/x-c-merge

Maint X -> Maint C merge

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
 
-		
+