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, 31 insertions, 21 deletions

diff --git a/indra/llmessage/llsdmessagebuilder.h b/indra/llmessage/llsdmessagebuilder.h
index f04194d12f..4e0d71fd8b 100755
--- a/indra/llmessage/llsdmessagebuilder.h
+++ b/indra/llmessage/llsdmessagebuilder.h
@@ -1,3 +1,11 @@
+/** 
+ * @file llsdmessagebuilder.h
+ * @brief Declaration of LLSDMessageBuilder class.
+ *
+ * Copyright (c) 2007-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
 #ifndef LL_LLSDMESSAGEBUILDER_H
 #define LL_LLSDMESSAGEBUILDER_H
 
@@ -19,31 +27,33 @@ public:
 	LLSDMessageBuilder();
 	virtual ~LLSDMessageBuilder();
 
-	virtual void newMessage(const char *name);
+	virtual void newMessage(const char* name);
 
 	virtual void nextBlock(const char* blockname);
 	virtual BOOL removeLastBlock(); // TODO: babbage: remove this horror...
 
 	/** All add* methods expect pointers to canonical varname strings. */
-	virtual void addBinaryData(const char *varname, const void *data, 
-							   S32 size);
+	virtual void addBinaryData(
+		const char* varname,
+		const void* data, 
+		S32 size);
 	virtual void addBOOL(const char* varname, BOOL b);
-	virtual void addS8(const char *varname, S8 s);
-	virtual void addU8(const char *varname, U8 u);
-	virtual void addS16(const char *varname, S16 i);
-	virtual void addU16(const char *varname, U16 i);
-	virtual void addF32(const char *varname, F32 f);
-	virtual void addS32(const char *varname, S32 s);
-	virtual void addU32(const char *varname, U32 u);
-	virtual void addU64(const char *varname, U64 lu);
-	virtual void addF64(const char *varname, F64 d);
-	virtual void addVector3(const char *varname, const LLVector3& vec);
-	virtual void addVector4(const char *varname, const LLVector4& vec);
-	virtual void addVector3d(const char *varname, const LLVector3d& vec);
-	virtual void addQuat(const char *varname, const LLQuaternion& quat);
-	virtual void addUUID(const char *varname, const LLUUID& uuid);
-	virtual void addIPAddr(const char *varname, const U32 ip);
-	virtual void addIPPort(const char *varname, const U16 port);
+	virtual void addS8(const char* varname, S8 s);
+	virtual void addU8(const char* varname, U8 u);
+	virtual void addS16(const char* varname, S16 i);
+	virtual void addU16(const char* varname, U16 i);
+	virtual void addF32(const char* varname, F32 f);
+	virtual void addS32(const char* varname, S32 s);
+	virtual void addU32(const char* varname, U32 u);
+	virtual void addU64(const char* varname, U64 lu);
+	virtual void addF64(const char* varname, F64 d);
+	virtual void addVector3(const char* varname, const LLVector3& vec);
+	virtual void addVector4(const char* varname, const LLVector4& vec);
+	virtual void addVector3d(const char* varname, const LLVector3d& vec);
+	virtual void addQuat(const char* varname, const LLQuaternion& quat);
+	virtual void addUUID(const char* varname, const LLUUID& uuid);
+	virtual void addIPAddr(const char* varname, const U32 ip);
+	virtual void addIPPort(const char* varname, const U16 port);
 	virtual void addString(const char* varname, const char* s);
 	virtual void addString(const char* varname, const std::string& s);
 
@@ -52,8 +62,8 @@ public:
 
 	virtual BOOL isBuilt() const;
 	virtual BOOL isClear() const;
-	virtual U32 buildMessage(U8* buffer, U32 buffer_size); 
-        /**< Return built message size */
+	virtual U32 buildMessage(U8* buffer, U32 buffer_size, U8 offset_to_data);
+        /**< Null implementation which returns 0. */
 	
 	virtual void clearMessage();