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

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

1 files changed, 24 insertions, 24 deletions

diff --git a/indra/llmessage/lltemplatemessagedispatcher.cpp b/indra/llmessage/lltemplatemessagedispatcher.cpp
index ee7a4e7e71..267c201705 100644
--- a/indra/llmessage/lltemplatemessagedispatcher.cpp
+++ b/indra/llmessage/lltemplatemessagedispatcher.cpp
@@ -5,21 +5,21 @@
  * $LicenseInfo:firstyear=2009&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$
  */
@@ -35,33 +35,33 @@
 
 
 LLTemplateMessageDispatcher::LLTemplateMessageDispatcher(LLTemplateMessageReader &template_message_reader) :
-	mTemplateMessageReader(template_message_reader)
+    mTemplateMessageReader(template_message_reader)
 {
 }
 
 void LLTemplateMessageDispatcher::dispatch(const std::string& msg_name,
-										   const LLSD& message,
-										   LLHTTPNode::ResponsePtr responsep)
+                                           const LLSD& message,
+                                           LLHTTPNode::ResponsePtr responsep)
 {
-	std::vector<U8> data = message["body"]["binary-template-data"].asBinary();
-	U32 size = data.size();
-	if(size == 0)
-	{
-		return;
-	}
+    std::vector<U8> data = message["body"]["binary-template-data"].asBinary();
+    U32 size = data.size();
+    if(size == 0)
+    {
+        return;
+    }
 
-	LLHost host;
-	host = gMessageSystem->getSender();
+    LLHost host;
+    host = gMessageSystem->getSender();
 
-	bool validate_message = mTemplateMessageReader.validateMessage(&(data[0]), data.size(), host, true);
+    bool validate_message = mTemplateMessageReader.validateMessage(&(data[0]), data.size(), host, true);
 
-	if (validate_message)
-	{
-		mTemplateMessageReader.readMessage(&(data[0]),host);
-	} 
-	else 
-	{
-		gMessageSystem->clearReceiveState();
-	}
+    if (validate_message)
+    {
+        mTemplateMessageReader.readMessage(&(data[0]),host);
+    }
+    else
+    {
+        gMessageSystem->clearReceiveState();
+    }
 }