summaryrefslogtreecommitdiff
path: root/indra/llmessage/llsdmessagebuilder.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-05-08 10:18:03 -0700
committerMerov Linden <merov@lindenlab.com>2012-05-08 10:18:03 -0700
commit60f602d5e12a50623b51b13e097992f79006823f (patch)
tree386e3cf5b25f3292e3ba7c8a9b0524c5bfbb9589 /indra/llmessage/llsdmessagebuilder.cpp
parent29da931051202a10ea71db56e47acecae1603a5d (diff)
parentccb86a2a6675b21dda6267d4a850e5a09acbafa4 (diff)
Pull from VirLinden/drano
Diffstat (limited to 'indra/llmessage/llsdmessagebuilder.cpp')
-rw-r--r--indra/llmessage/llsdmessagebuilder.cpp2
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: