diff options
| author | Aura Linden <aura@lindenlab.com> | 2013-12-17 00:13:07 -0800 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2013-12-17 00:13:07 -0800 |
| commit | 1219fe0e1b27e4468e0ee2f0f65e79b894296022 (patch) | |
| tree | aaf206a79d3fe39a3e2cca6c479b4f97f28b0a8f /indra/llmessage/lltemplatemessagereader.cpp | |
| parent | ddd6b8f91baa4ce408682925e12c4a58b8139b78 (diff) | |
| parent | 6f34508aa9408266bfde366aa4e0cb6518ed45b8 (diff) | |
Mac Fullscreen fix for MAINT-3288 and MAINT-3135
Diffstat (limited to 'indra/llmessage/lltemplatemessagereader.cpp')
| -rwxr-xr-x | indra/llmessage/lltemplatemessagereader.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/llmessage/lltemplatemessagereader.cpp b/indra/llmessage/lltemplatemessagereader.cpp index ab91f74abe..94bc7cb045 100755 --- a/indra/llmessage/lltemplatemessagereader.cpp +++ b/indra/llmessage/lltemplatemessagereader.cpp @@ -91,15 +91,17 @@ void LLTemplateMessageReader::getData(const char *blockname, const char *varname } LLMsgBlkData *msg_block_data = iter->second; - LLMsgVarData& vardata = msg_block_data->mMemberVarData[vnamep]; + LLMsgBlkData::msg_var_data_map_t &var_data_map = msg_block_data->mMemberVarData; - if (!vardata.getName()) + if (var_data_map.find(vnamep) == var_data_map.end()) { llerrs << "Variable "<< vnamep << " not in message " << mCurrentRMessageData->mName<< " block " << bnamep << llendl; return; } + LLMsgVarData& vardata = msg_block_data->mMemberVarData[vnamep]; + if (size && size != vardata.getSize()) { llerrs << "Msg " << mCurrentRMessageData->mName |