summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authormaksymsproductengine <maksymsproductengine@lindenlab.com>2013-05-31 20:05:12 +0300
committermaksymsproductengine <maksymsproductengine@lindenlab.com>2013-05-31 20:05:12 +0300
commit90a3285e2619cae3fad057168e78030ec1877a32 (patch)
tree0132857f7218089b37833549906eee3ff59046fb /indra
parent0b4b92cbbfff5cd5ef6ed697a7605db7686c9952 (diff)
CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0
Diffstat (limited to 'indra')
-rwxr-xr-xindra/llui/lltexteditor.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 5e553fcd16..d1c4bcb24b 100755
--- a/indra/llui/lltexteditor.cpp
+++ b/indra/llui/lltexteditor.cpp
@@ -2767,10 +2767,8 @@ void LLTextEditor::updatePreedit(const LLWString &preedit_string,
}
segment_vec_t segments;
- LLStyleConstSP sp(new LLStyle(getStyleParams()));
- segments.push_back(new LLNormalTextSegment(sp, 0, mPreeditWString.length(), *this));
-
- insertStringNoUndo(insert_preedit_at, mPreeditWString, &segments);
+ //pass empty segments to let "insertStringNoUndo" make new LLNormalTextSegment and insert it, if needed.
+ insertStringNoUndo(insert_preedit_at, mPreeditWString, &segments);
mPreeditStandouts = preedit_standouts;