diff options
author | Geenz <geenz@geenzo.com> | 2013-05-13 22:22:51 -0400 |
---|---|---|
committer | Geenz <geenz@geenzo.com> | 2013-05-13 22:22:51 -0400 |
commit | 3779e51bfc2010877960d11b463c7316514bf991 (patch) | |
tree | ab528a6e7f78f136f9d0f0f7e939264897a44ae1 /indra/llcommon/llsdserialize.cpp | |
parent | b27899ee0e035ebd4072a5e6162678f2afe81053 (diff) | |
parent | 4dd245055f3417d8f8fb611a198ed5671dbce292 (diff) |
Merged with https://bitbucket.org/lindenlab/viewer-beta
Diffstat (limited to 'indra/llcommon/llsdserialize.cpp')
-rwxr-xr-x[-rw-r--r--] | indra/llcommon/llsdserialize.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index 6b549e4b6f..ad4fce6f35 100644..100755 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -1453,8 +1453,8 @@ S32 LLSDBinaryFormatter::format(const LLSD& data, std::ostream& ostr, U32 option case LLSD::TypeUUID: { ostr.put('u'); - LLSD::UUID value = data.asUUID(); - ostr.write((const char*)(&value.mData), UUID_BYTES); + LLUUID temp = data.asUUID(); + ostr.write((const char*)(&(temp.mData)), UUID_BYTES); break; } |