diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2012-07-02 18:06:22 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2012-07-02 18:06:22 -0400 |
| commit | 8e5197a71bef5704956ed61eab03509a1cdb6f6f (patch) | |
| tree | 499fd5e906372f74a25d77331b9d5a0d9a8afef4 /indra/llcommon/llsdserialize.cpp | |
| parent | 90547ff411db177bf6424ca553449a81a808fc0f (diff) | |
| parent | e8b0088d1a0c02bfa1f9768dc91fc3df4322adae (diff) | |
Merge 3.3.3 release with Drano HTTP library at 3.3.0
Big delta was converting the new texture debugger support code
to the new library. Viewer manifest should probably get an eyeball
before release.
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 b419101b7e..b61f27b55f 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -1447,9 +1447,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'); |