diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-12-19 20:17:08 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-12-19 20:17:08 +0000 |
| commit | 6c6987e8a3fa8066e8259b4f92523f61704e3389 (patch) | |
| tree | 0df84efd2c17c267d7ae4399c607bef209bd2630 | |
| parent | 7dd08303a3ebf9718c2c60a4d94b81d5d7845f8c (diff) | |
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.
| -rw-r--r-- | indra/llcommon/llstring.h | 2 |
1 files changed, 1 insertions, 1 deletions
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); |