diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-01 16:32:16 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-01 16:32:16 +0200 |
| commit | bf6d1713ec71ca88daf0f19c6d444b82ba2ccad2 (patch) | |
| tree | eaf444acb6a27e76ac0bb1723f0f9853e8980f7b /indra/llmessage/llmessagetemplate.h | |
| parent | 3650ef0d9ff937aeb1081817158021adb3f081d2 (diff) | |
| parent | 379762d2c1dd4e0804dd6ab1b930f525e1a60189 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llmessage/llmessagetemplate.h')
| -rw-r--r-- | indra/llmessage/llmessagetemplate.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h index d7f02ebd85..8abc0aaab2 100644 --- a/indra/llmessage/llmessagetemplate.h +++ b/indra/llmessage/llmessagetemplate.h @@ -82,7 +82,7 @@ protected: class LLMsgBlkData { public: - LLMsgBlkData(const char *name, S32 blocknum) : mOffset(-1), mBlockNumber(blocknum), mTotalSize(-1) + LLMsgBlkData(const char *name, S32 blocknum) : mBlockNumber(blocknum), mTotalSize(-1) { mName = (char *)name; } @@ -108,7 +108,6 @@ public: temp->addData(data, size, type, data_size); } - S32 mOffset; S32 mBlockNumber; typedef LLDynamicArrayIndexed<LLMsgVarData, const char *, 8> msg_var_data_map_t; msg_var_data_map_t mMemberVarData; @@ -136,7 +135,6 @@ public: void addDataFast(char *blockname, char *varname, const void *data, S32 size, EMsgVariableType type, S32 data_size = -1); public: - S32 mOffset; typedef std::map<char*, LLMsgBlkData*> msg_blk_data_map_t; msg_blk_data_map_t mMemberBlocks; char *mName; |