From 6c6987e8a3fa8066e8259b4f92523f61704e3389 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Wed, 19 Dec 2007 20:17:08 +0000 Subject: svn merge -r75015:75150 svn+ssh://svn/svn/linden/branches/security-lsl-setname --> release QAR-146 Merge of fix for DEV-6375/SVC-997: llSetObjectName / Desc not properly capped. --- indra/llcommon/llstring.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index d4925d8bee..e2f605db4f 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -453,7 +453,7 @@ S32 wstring_wstring_length_from_utf16_length(const LLWString & wstr, S32 woffset * happens in the middle of a glyph. If max_len is longer than the * string passed in, the return value == utf8str. * @param utf8str A valid utf8 string to truncate. - * @param max_len The maximum number of bytes in the returne + * @param max_len The maximum number of bytes in the return value. * @return Returns a valid utf8 string with byte count <= max_len. */ std::string utf8str_truncate(const std::string& utf8str, const S32 max_len); -- cgit v1.2.3