svn merge --ignore-ancestry svn+ssh://svn/svn/linden/release@65088 svn+ssh://svn/svn/linden/branches/release-candidate@65078 -> release Paired by Tess and rdw.

1 files changed, 34 insertions, 26 deletions

diff --git a/indra/llmessage/llsdmessagebuilder.cpp b/indra/llmessage/llsdmessagebuilder.cpp
index b7deb4817f..94d2378050 100755
--- a/indra/llmessage/llsdmessagebuilder.cpp
+++ b/indra/llmessage/llsdmessagebuilder.cpp
@@ -1,3 +1,11 @@
+/** 
+ * @file llsdmessagebuilder.cpp
+ * @brief LLSDMessageBuilder class implementation.
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
 #include "linden_common.h"
 
 #include "llsdmessagebuilder.h"
@@ -28,13 +36,13 @@ LLSDMessageBuilder::~LLSDMessageBuilder()
 
 
 // virtual
-void LLSDMessageBuilder::newMessage(const char *name)
+void LLSDMessageBuilder::newMessage(const char* name)
 {
 	mbSBuilt = FALSE;
 	mbSClear = FALSE;
 
 	mCurrentMessage = LLSD::emptyMap();
-	mCurrentMessageName = (char *)name;
+	mCurrentMessageName = (char*)name;
 }
 
 // virtual
@@ -74,8 +82,10 @@ BOOL LLSDMessageBuilder::removeLastBlock()
 	return FALSE;
 }
 
-void LLSDMessageBuilder::addBinaryData(const char *varname, 
-									   const void *data, S32 size)
+void LLSDMessageBuilder::addBinaryData(
+	const char* varname, 
+	const void* data,
+	S32 size)
 {
 	std::vector<U8> v;
 	v.resize(size);
@@ -83,57 +93,57 @@ void LLSDMessageBuilder::addBinaryData(const char *varname,
 	(*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addS8(const char *varname, S8 v)
+void LLSDMessageBuilder::addS8(const char* varname, S8 v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addU8(const char *varname, U8 v)
+void LLSDMessageBuilder::addU8(const char* varname, U8 v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addS16(const char *varname, S16 v)
+void LLSDMessageBuilder::addS16(const char* varname, S16 v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addU16(const char *varname, U16 v)
+void LLSDMessageBuilder::addU16(const char* varname, U16 v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addF32(const char *varname, F32 v)
+void LLSDMessageBuilder::addF32(const char* varname, F32 v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addS32(const char *varname, S32 v)
+void LLSDMessageBuilder::addS32(const char* varname, S32 v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addU32(const char *varname, U32 v)
+void LLSDMessageBuilder::addU32(const char* varname, U32 v)
 {
 	(*mCurrentBlock)[varname] = ll_sd_from_U32(v);
 }
 
-void LLSDMessageBuilder::addU64(const char *varname, U64 v)
+void LLSDMessageBuilder::addU64(const char* varname, U64 v)
 {
 	(*mCurrentBlock)[varname] = ll_sd_from_U64(v);
 }
 
-void LLSDMessageBuilder::addF64(const char *varname, F64 v)
+void LLSDMessageBuilder::addF64(const char* varname, F64 v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
 
-void LLSDMessageBuilder::addIPAddr(const char *varname, U32 v)
+void LLSDMessageBuilder::addIPAddr(const char* varname, U32 v)
 {
 	(*mCurrentBlock)[varname] = ll_sd_from_ipaddr(v);
 }
 
-void LLSDMessageBuilder::addIPPort(const char *varname, U16 v)
+void LLSDMessageBuilder::addIPPort(const char* varname, U16 v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
@@ -159,27 +169,27 @@ void LLSDMessageBuilder::addString(const char* varname, const std::string& v)
 		(*mCurrentBlock)[varname] = ""; 
 }
 
-void LLSDMessageBuilder::addVector3(const char *varname, const LLVector3& v)
+void LLSDMessageBuilder::addVector3(const char* varname, const LLVector3& v)
 {
 	(*mCurrentBlock)[varname] = ll_sd_from_vector3(v);
 }
 
-void LLSDMessageBuilder::addVector4(const char *varname, const LLVector4& v)
+void LLSDMessageBuilder::addVector4(const char* varname, const LLVector4& v)
 {
 	(*mCurrentBlock)[varname] = ll_sd_from_vector4(v);
 }
 
-void LLSDMessageBuilder::addVector3d(const char *varname, const LLVector3d& v)
+void LLSDMessageBuilder::addVector3d(const char* varname, const LLVector3d& v)
 {
 	(*mCurrentBlock)[varname] = ll_sd_from_vector3d(v);
 }
 
-void LLSDMessageBuilder::addQuat(const char *varname, const LLQuaternion& v)
+void LLSDMessageBuilder::addQuat(const char* varname, const LLQuaternion& v)
 {
 	(*mCurrentBlock)[varname] = ll_sd_from_quaternion(v);
 }
 
-void LLSDMessageBuilder::addUUID(const char *varname, const LLUUID& v)
+void LLSDMessageBuilder::addUUID(const char* varname, const LLUUID& v)
 {
 	(*mCurrentBlock)[varname] = v;
 }
@@ -193,9 +203,7 @@ BOOL LLSDMessageBuilder::isMessageFull(const char* blockname) const
 	return FALSE;
 }
 
-// make sure that all the desired data is in place and then copy the data 
-// into MAX_BUFFER_SIZEd buffer
-U32 LLSDMessageBuilder::buildMessage(U8* buffer, U32 buffer_size)
+U32 LLSDMessageBuilder::buildMessage(U8*, U32, U8)
 {
 	return 0;
 }
@@ -205,7 +213,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
 	// copy the blocks
 	// counting variables used to encode multiple block info
 	S32 block_count = 0;
-    char *block_name = NULL;
+    char* block_name = NULL;
 
 	// loop through msg blocks to loop through variables, totalling up size
 	// data and filling the new (send) message
@@ -222,7 +230,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
 		if (block_count == 0)
 		{
 			block_count = mbci->mBlockNumber;
-			block_name = (char *)mbci->mName;
+			block_name = (char*)mbci->mName;
 		}
 
 		// counting down mutliple blocks
@@ -248,7 +256,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data)
 void LLSDMessageBuilder::copyFromLLSD(const LLSD& msg)
 {
 	mCurrentMessage = msg;
-	llinfos << LLSDXMLStreamer(mCurrentMessage) << llendl;
+	lldebugs << LLSDXMLStreamer(mCurrentMessage) << llendl;
 }
 
 const LLSD& LLSDMessageBuilder::getMessage() const