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, 33 insertions, 20 deletions

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