IME composition is now replaced by the result

instead of being printed alongside.
For now, it always gets reset from the start after pressing Return,
which is to be fixed next.

1 files changed, 2 insertions, 2 deletions

diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 513781e365..0697a2149d 100644
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -101,7 +101,7 @@ public:
 
 	virtual BOOL	handleKeyHere(KEY key, MASK mask );
 	virtual BOOL	handleUnicodeCharHere(llwchar uni_char);
-	virtual BOOL	handleUnicodeStringHere(char *uni_str);
+	virtual BOOL	handleUnicodeStringHere(char *uni_str, bool editing);
 
 	virtual void	onMouseCaptureLost();
 
@@ -242,7 +242,7 @@ protected:
 	// Undoable operations
 	void			addChar(llwchar c); // at mCursorPos
 	S32				addChar(S32 pos, llwchar wc);
-	void			addString(char *s);
+	void			addString(char *s, bool editing);
 	S32				addString(S32 pos, char *str);
 	void			addLineBreakChar(BOOL group_together = FALSE);
 	S32				overwriteChar(S32 pos, llwchar wc);