summaryrefslogtreecommitdiff
path: root/indra/llmessage/llsdmessagebuilder.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2012-03-01 13:31:17 -0800
committerMerov Linden <merov@lindenlab.com>2012-03-01 13:31:17 -0800
commit24789f11cc58cf7c03283a8e9648085a5cb9d7d8 (patch)
treebade7e21ca009bdb6a9f89b155732876bb02035d /indra/llmessage/llsdmessagebuilder.cpp
parenta7499dc4abfa5fa7582dc7ebb535a07ed94d0c4f (diff)
parent66f101bac591d82b71ab7dc976b6fed0ed451909 (diff)
Pull from viewer-experience
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: