From 1234cf42e9f84f9c32078eafb0431d70094ba826 Mon Sep 17 00:00:00 2001 From: Shyotl Date: Wed, 10 Jul 2019 01:37:00 -0500 Subject: [PATCH] msg_blk_data_map_t mMemberBlocks must be ordered. Todo: convert to vector, as insertion order should be good enough with minor changes. --- indra/llmessage/llmessagetemplate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/indra/llmessage/llmessagetemplate.h b/indra/llmessage/llmessagetemplate.h index d9303505e..7cc6d5544 100644 --- a/indra/llmessage/llmessagetemplate.h +++ b/indra/llmessage/llmessagetemplate.h @@ -32,7 +32,7 @@ #include "llstl.h" #include "llindexedvector.h" -#include +#include extern U32 sMsgDataAllocSize; extern U32 sMsgdataAllocCount; @@ -134,7 +134,7 @@ public: void addDataFast(char *blockname, char *varname, const void *data, S32 size, EMsgVariableType type, S32 data_size = -1); public: - typedef std::unordered_map msg_blk_data_map_t; + typedef std::map msg_blk_data_map_t; msg_blk_data_map_t mMemberBlocks; char *mName; S32 mTotalSize;