diff options
| author | Oz Linden <oz@lindenlab.com> | 2016-08-11 15:36:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2016-08-11 15:36:09 -0400 |
| commit | 6ff420d705625fef4b0456c19bb9c766cabb31af (patch) | |
| tree | 16c27571df04932dd830b35e06cdf4e9b5dbf07e /indra/llui/lllineeditor.cpp | |
| parent | c32b27f5b77c7d8e53b11163d04f2842949d71de (diff) | |
| parent | 4fb100ac7a33174883184f1320d0beac08ead3a7 (diff) | |
merge changes for 4.0.7-release
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rw-r--r-- | indra/llui/lllineeditor.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index a08cf91a69..492c9315d1 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -400,12 +400,7 @@ void LLLineEditor::setText(const LLStringExplicit &new_text) if (mMaxLengthChars) { - LLWString truncated_wstring = utf8str_to_wstring(truncated_utf8); - if (truncated_wstring.size() > (U32)mMaxLengthChars) - { - truncated_wstring = truncated_wstring.substr(0, mMaxLengthChars); - } - mText.assign(wstring_to_utf8str(truncated_wstring)); + mText.assign(utf8str_symbol_truncate(truncated_utf8, mMaxLengthChars)); } if (all_selected) |