diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-09-04 13:41:51 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2013-09-04 13:41:51 -0400 |
| commit | 144eb1912def502dfd5d9f7d224949309300e14b (patch) | |
| tree | 630ca7e454c97bd9bae42da3db02f5e3ff1f0bf5 /indra/llui/lltexteditor.h | |
| parent | cda8a75dd69789d0d9f77c76ab0c461e8791fd60 (diff) | |
| parent | 6e1138585bf745f73f0bb99ca62f77eeb273f1e4 (diff) | |
merge
Diffstat (limited to 'indra/llui/lltexteditor.h')
| -rwxr-xr-x | indra/llui/lltexteditor.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index 969e072704..32b543ec0e 100755 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -248,13 +248,14 @@ protected: // Undoable operations void addChar(llwchar c); // at mCursorPos S32 addChar(S32 pos, llwchar wc); - void addLineBreakChar(); + void addLineBreakChar(BOOL group_together = FALSE); S32 overwriteChar(S32 pos, llwchar wc); void removeChar(); S32 removeChar(S32 pos); S32 insert(S32 pos, const LLWString &wstr, bool group_with_next_op, LLTextSegmentPtr segment); S32 remove(S32 pos, S32 length, bool group_with_next_op); + void focusLostHelper(); void updateAllowingLanguageInput(); BOOL hasPreeditString() const; |