diff options
author | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2012-05-02 15:59:15 -0700 |
commit | 56af97063aaa35c1a70f5edaf47f4a015600860d (patch) | |
tree | 299b113fab1ff7176c86342aa3e881491cd3b883 /indra/llmessage/llsdmessagebuilder.cpp | |
parent | b679975d8fdc22d33d0f62288934be8f0209157e (diff) | |
parent | 681c5de92bd09622de360818682240b0a17403f7 (diff) |
Pull from vir/drano
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: |