diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-29 18:01:02 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-29 18:01:02 +0200 |
| commit | 675df36965c346f323bb2025cd832a4dc7c9cdce (patch) | |
| tree | cd4f950defd428e37340229013502d8d8ee48c88 /indra/llmessage/lltemplatemessagebuilder.cpp | |
| parent | 67d006e404d830931db17814e8da38cc55332152 (diff) | |
| parent | 86609394caf1ebb20dd90de37b9af1471ae8aa20 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/llmessage/lltemplatemessagebuilder.cpp')
| -rw-r--r-- | indra/llmessage/lltemplatemessagebuilder.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llmessage/lltemplatemessagebuilder.cpp b/indra/llmessage/lltemplatemessagebuilder.cpp index 6400310c46..55379fc6fd 100644 --- a/indra/llmessage/lltemplatemessagebuilder.cpp +++ b/indra/llmessage/lltemplatemessagebuilder.cpp @@ -737,10 +737,14 @@ static S32 buildBlock(U8* buffer, S32 buffer_size, const LLMessageBlock* templat } --block_count; - ++block_iter; + if (block_iter != message_data->mMemberBlocks.end()) { - mbci = block_iter->second; + ++block_iter; + if (block_iter != message_data->mMemberBlocks.end()) + { + mbci = block_iter->second; + } } } |