diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-04-20 06:56:33 -0700 |
| commit | d3ec35fc6c2b8b47336650fe0570995201854a78 (patch) | |
| tree | f2113a1fa374fab76509f4462b2253b315584f65 /indra/llmessage/llsdmessagebuilder.cpp | |
| parent | 4c3377a45abe3c8b2a0e376c62045a8f1260da08 (diff) | |
| parent | 19e0cc93a8af661dbac47552474a704ade600c74 (diff) | |
merge changes for latest viewer-development
Diffstat (limited to 'indra/llmessage/llsdmessagebuilder.cpp')
| -rw-r--r-- | indra/llmessage/llsdmessagebuilder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llsdmessagebuilder.cpp b/indra/llmessage/llsdmessagebuilder.cpp index 2698a271ee..615221e0ad 100644 --- a/indra/llmessage/llsdmessagebuilder.cpp +++ b/indra/llmessage/llsdmessagebuilder.cpp @@ -317,7 +317,7 @@ void LLSDMessageBuilder::copyFromMessageData(const LLMsgData& data) // S64 not supported in LLSD so we just truncate it case MVT_S64: - addS32(varname, *(S64*)mvci.getData()); + addS32(varname, (S32)*(S64*)mvci.getData()); break; case MVT_F32: |