From ae464867e6714816cd5bdaeecdd1d3c0a0817e58 Mon Sep 17 00:00:00 2001
From: Jon Wolk <jwolk@lindenlab.com>
Date: Tue, 15 Jul 2008 00:41:08 +0000
Subject: svn merge -r 90938:92097
 svn+ssh://svn.lindenlab.com/svn/linden/branches/qar-730/qar-730-merge ->
 release.  This is for QAR-730: Combination merge of QAR-432 and QAR-601

---
 indra/llcommon/lluuid.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/llcommon/lluuid.cpp')

diff --git a/indra/llcommon/lluuid.cpp b/indra/llcommon/lluuid.cpp
index 51e27e0708..1098d1bd3c 100644
--- a/indra/llcommon/lluuid.cpp
+++ b/indra/llcommon/lluuid.cpp
@@ -184,7 +184,7 @@ void LLUUID::toCompressedString(std::string& out) const
 	char bytes[UUID_BYTES+1];
 	memcpy(bytes, mData, UUID_BYTES);		/* Flawfinder: ignore */
 	bytes[UUID_BYTES] = '\0';
-	out = bytes;
+	out.assign(bytes, UUID_BYTES);
 }
 
 // *TODO: deprecate
-- 
cgit v1.3