svn merge -r 59163:61099 svn+ssh://svn/svn/linden/branches/release-candidate into release

1 files changed, 88 insertions, 0 deletions

diff --git a/indra/llmessage/lltemplatemessagebuilder.h b/indra/llmessage/lltemplatemessagebuilder.h
new file mode 100644
index 0000000000..ae533288fb
--- /dev/null
+++ b/indra/llmessage/lltemplatemessagebuilder.h
@@ -0,0 +1,88 @@
+#ifndef LL_LLTEMPLATEMESSAGEBUILDER_H
+#define LL_LLTEMPLATEMESSAGEBUILDER_H
+
+#include <map>
+
+#include "llmessagebuilder.h"
+#include "llmsgvariabletype.h"
+
+class LLMsgData;
+class LLMessageTemplate;
+class LLMsgBlkData;
+class LLMessageTemplate;
+
+class LLTemplateMessageBuilder : public LLMessageBuilder
+{
+public:
+	
+	typedef std::map<const char *, LLMessageTemplate*> message_template_name_map_t;
+
+	LLTemplateMessageBuilder(message_template_name_map_t&);
+	virtual ~LLTemplateMessageBuilder();
+
+	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 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 addString(const char* varname, const char* s);
+	virtual void addString(const char* varname, const std::string& s);
+
+	virtual BOOL isMessageFull(const char* blockname) const;
+	virtual void compressMessage(U8*& buf_ptr, U32& buffer_length);
+
+	virtual BOOL isBuilt() const;
+	virtual BOOL isClear() const;
+	virtual U32 buildMessage(U8* buffer, U32 buffer_size); 
+        /**< Return built message size */
+	
+	virtual void clearMessage();
+
+	// TODO: babbage: remove this horror.
+	virtual void setBuilt(BOOL b);
+
+	virtual S32 getMessageSize();
+	virtual const char* getMessageName() const;
+
+	virtual void copyFromMessageData(const LLMsgData& data);
+	virtual void copyFromLLSD(const LLSD&);
+
+private:
+	void addData(const char *varname, const void *data, 
+					 EMsgVariableType type, S32 size);
+	
+	void addData(const char *varname, const void *data, 
+						EMsgVariableType type);
+
+	LLMsgData* mCurrentSMessageData;
+	LLMessageTemplate* mCurrentSMessageTemplate;
+	LLMsgBlkData* mCurrentSDataBlock;
+	char* mCurrentSMessageName;
+	char* mCurrentSBlockName;
+	BOOL mbSBuilt;
+	BOOL mbSClear;
+	S32	 mCurrentSendTotal;
+	message_template_name_map_t& mMessageTemplates;
+};
+
+#endif // LL_LLTEMPLATEMESSAGEBUILDER_H