From ef54491760a6c66ba18b385ca40f4a4d9e9c0500 Mon Sep 17 00:00:00 2001 From: Siana Gearz Date: Wed, 19 Oct 2011 05:33:09 +0200 Subject: [PATCH] GCC 4.6.1 fix --- indra/llcommon/llsdserialize.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/indra/llcommon/llsdserialize.cpp b/indra/llcommon/llsdserialize.cpp index fb5fb7cad..103f3b247 100644 --- a/indra/llcommon/llsdserialize.cpp +++ b/indra/llcommon/llsdserialize.cpp @@ -1454,9 +1454,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); + LLUUID value = data.asUUID(); + ostr.write((const char*)(&value.mData), UUID_BYTES); break; + } case LLSD::TypeString: ostr.put('s'); @@ -2173,4 +2176,4 @@ bool unzip_llsd(LLSD& data, std::istream& is, S32 size) free(result); return true; } -#endif //MESH_ENABLED \ No newline at end of file +#endif //MESH_ENABLED