From 90a3285e2619cae3fad057168e78030ec1877a32 Mon Sep 17 00:00:00 2001
From: maksymsproductengine <maksymsproductengine@lindenlab.com>
Date: Fri, 31 May 2013 20:05:12 +0300
Subject: [PATCH] CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0
---
doc/contributions.txt | 2 ++
indra/llui/lltexteditor.cpp | 6 ++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 8c5bb3d5763..8c2f46acf45 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -176,6 +176,8 @@ Ansariel Hiller
STORM-1713
STORM-1899
Aralara Rajal
+Arare Chantilly
+ CHUIBUG-191
Ardy Lay
STORM-859
VWR-19499
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp
index 5e553fcd16b..d1c4bcb24bf 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;
--
GitLab