diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:15:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-08-19 15:15:15 -0400 |
| commit | 82bf4e4db2bdb9effdf64e9edaa76a78913e25d3 (patch) | |
| tree | 7f44a97fdf51222e743e18464d1b2d0ccb5b830e /indra/llui/lltexteditor.h | |
| parent | 731fe3e7c6287c63134c1a08572f9d97a0eb0ff0 (diff) | |
| parent | 86b4019684af96a64a1d439851f177d7c18e4c24 (diff) | |
merge changes for DRTVWR-285
Diffstat (limited to 'indra/llui/lltexteditor.h')
| -rwxr-xr-x | indra/llui/lltexteditor.h | 2 |
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); |