summaryrefslogtreecommitdiff
path: root/indra/llcommon/llsdserialize.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-11-13 10:50:16 -0500
committerOz Linden <oz@lindenlab.com>2012-11-13 10:50:16 -0500
commit7e779a29c142feaa34a30dff39b72d0ae7c0fdc3 (patch)
tree401447b5d265520c12de5c4929f0e72468882b68 /indra/llcommon/llsdserialize.cpp
parent42c957e9d823ee5124fa1ac992fc0e803a3b0d9a (diff)
parent7cef2e02565977d3894dbd7c9bde91fb39d9066a (diff)
merge changes for DRTVWR-209
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
-rw-r--r--indra/llcommon/llsdserialize.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp
index 7f4f670ed0..6b549e4b6f 100644
--- a/indra/llcommon/llsdserialize.cpp
+++ b/indra/llcommon/llsdserialize.cpp
@@ -1451,9 +1451,12 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option
}
case LLSD::TypeUUID:
+ {
ostr.put('u');
- ostr.write((const char*)(&(data.asUUID().mData)), UUID_BYTES);
+ LLSD::UUID value = data.asUUID();
+ ostr.write((const char*)(&value.mData), UUID_BYTES);
break;
+ }
case LLSD::TypeString:
ostr.put('s');