summaryrefslogtreecommitdiff
path: root/indra/llui/lllineeditor.cpp
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2016-08-04 21:11:32 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2016-08-04 21:11:32 +0300
commit6de863132756ffdf3778721ec9dd0f3a15bf464a (patch)
tree6bc5a3c515fe92cb785b7eaf9b6860e7e7110b61 /indra/llui/lllineeditor.cpp
parent2339e759fc2d6f36a4b9425022a22a747ec55dad (diff)
parentce3658455230cf392f45cc99f44a737ee59f13bd (diff)
Merged in lindenlab/viewer-lynx
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
-rw-r--r--indra/llui/lllineeditor.cpp7
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)