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