diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-06-16 00:01:59 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2016-06-16 00:01:59 +0300 |
| commit | a199cd76a19e6ba9c9bcbadc66c065285fe63886 (patch) | |
| tree | f8bf9194baebc1f157e0b736d358e1c7f12ba06a /indra/llui | |
| parent | 0a7144c8708d5a231b9588ff3a13fe3345110f34 (diff) | |
| parent | 0597f876469d8ef672a270528cbeecc069ab5e66 (diff) | |
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/llui')
| -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) |