diff options
author | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 17:17:41 -0800 |
---|---|---|
committer | William Todd Stinson <stinson@lindenlab.com> | 2012-11-13 17:17:41 -0800 |
commit | 76990fab4f3c73ab1b2051421c52444de28f9d32 (patch) | |
tree | af43dee1ea44dfc900d56607e5195557a439fb3f /indra/llcommon/llsdserialize.cpp | |
parent | 062a4388318de3f9142697d9043143a74ce3aaf8 (diff) | |
parent | be210914f4e9081f021cc1ad3b671765aba79b61 (diff) |
Pull and merge from https://bitbucket.org/lindenlab/viewer-development.
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
-rw-r--r-- | indra/llcommon/llsdserialize.cpp | 5 |
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'); |