summaryrefslogtreecommitdiff
path: root/indra/llui/lltexteditor.h
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-08-21 18:56:11 +0300
committermberezhnoy <mberezhnoy@productengine.com>2013-08-21 18:56:11 +0300
commit15e59b81b0f1117384d2400619f3460dafbb7a3f (patch)
tree33e2c5f8635465a2046838e9abeeacb0fa5bd193 /indra/llui/lltexteditor.h
parent10419d802f88e7636a6ca45c6025b7e19b3ca3c7 (diff)
parent82bf4e4db2bdb9effdf64e9edaa76a78913e25d3 (diff)
merge
Diffstat (limited to 'indra/llui/lltexteditor.h')
-rwxr-xr-xindra/llui/lltexteditor.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h
index 13f63a17ef..32b543ec0e 100755
--- a/indra/llui/lltexteditor.h
+++ b/indra/llui/lltexteditor.h
@@ -248,7 +248,7 @@ 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);