Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev

merge maint-a (including maint-x) into gltf_development

1 files changed, 26 insertions, 26 deletions

diff --git a/indra/llcorehttp/httpresponse.cpp b/indra/llcorehttp/httpresponse.cpp
index f5ad2ebd47..1436054c0b 100644
--- a/indra/llcorehttp/httpresponse.cpp
+++ b/indra/llcorehttp/httpresponse.cpp
@@ -1,6 +1,6 @@
 /**
  * @file httpresponse.cpp
- * @brief 
+ * @brief
  *
  * $LicenseInfo:firstyear=2012&license=viewerlgpl$
  * Second Life Viewer Source Code
@@ -34,41 +34,41 @@ namespace LLCore
 
 
 HttpResponse::HttpResponse()
-	: LLCoreInt::RefCounted(true),
-	  mReplyOffset(0U),
-	  mReplyLength(0U),
-	  mReplyFullLength(0U),
-	  mBufferArray(NULL),
-	  mHeaders(),
-	  mRetries(0U),
-	  m503Retries(0U),
+    : LLCoreInt::RefCounted(true),
+      mReplyOffset(0U),
+      mReplyLength(0U),
+      mReplyFullLength(0U),
+      mBufferArray(NULL),
+      mHeaders(),
+      mRetries(0U),
+      m503Retries(0U),
       mRequestUrl()
 {}
 
 
 HttpResponse::~HttpResponse()
 {
-	setBody(NULL);
-	//setHeaders();
+    setBody(NULL);
+    //setHeaders();
 }
 
 
 void HttpResponse::setBody(BufferArray * ba)
 {
-	if (mBufferArray == ba)
-		return;
-	
-	if (mBufferArray)
-	{
-		mBufferArray->release();
-	}
-
-	if (ba)
-	{
-		ba->addRef();
-	}
-	
-	mBufferArray = ba;
+    if (mBufferArray == ba)
+        return;
+
+    if (mBufferArray)
+    {
+        mBufferArray->release();
+    }
+
+    if (ba)
+    {
+        ba->addRef();
+    }
+
+    mBufferArray = ba;
 }
 
 
@@ -79,7 +79,7 @@ void HttpResponse::setHeaders(HttpHeaders::ptr_t &headers)
 
 size_t HttpResponse::getBodySize() const
 {
-	return (mBufferArray) ? mBufferArray->size() : 0;
+    return (mBufferArray) ? mBufferArray->size() : 0;
 }
 
 }   // end namespace LLCore