diff options
| author | Jon Wolk <jwolk@lindenlab.com> | 2008-07-15 00:41:08 +0000 |
|---|---|---|
| committer | Jon Wolk <jwolk@lindenlab.com> | 2008-07-15 00:41:08 +0000 |
| commit | ae464867e6714816cd5bdaeecdd1d3c0a0817e58 (patch) | |
| tree | 02830da2f640dab402a7e7222b4f0aa6eca930b2 /indra/llcommon/lluuid.cpp | |
| parent | 40d2bb564d35809d7735d2ec06ba988db7327020 (diff) | |
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
Diffstat (limited to 'indra/llcommon/lluuid.cpp')
| -rw-r--r-- | indra/llcommon/lluuid.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 |