result of merge manually performed through diff and patch. svn diff svn+ssh://svn/svn/linden/release@63615 svn+ssh://svn/svn/linden/branches/release-candidate@63637 | patch -p0 in release

1 files changed, 7 insertions, 5 deletions

diff --git a/indra/llmessage/message.cpp b/indra/llmessage/message.cpp
index a305797fd2..c00a0fe154 100644
--- a/indra/llmessage/message.cpp
+++ b/indra/llmessage/message.cpp
@@ -2927,17 +2927,19 @@ static LLHTTPNode& messageRootNode()
 }
 
 //static
-void LLMessageSystem::dispatch(const std::string& msg_name,
-								const LLSD& message)
+void LLMessageSystem::dispatch(
+	const std::string& msg_name,
+	const LLSD& message)
 {
 	LLPointer<LLSimpleResponse>	responsep =	LLSimpleResponse::create();
 	dispatch(msg_name, message, responsep);
 }
 
 //static
-void LLMessageSystem::dispatch(const std::string& msg_name,
-								const LLSD& message,
-							   LLHTTPNode::ResponsePtr responsep)
+void LLMessageSystem::dispatch(
+	const std::string& msg_name,
+	const LLSD& message,
+	LLHTTPNode::ResponsePtr responsep)
 {
 	if (msg_name.empty())
 	{