diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 18:51:19 -0400 |
commit | 620817c1c3368d73f1b47b1593a0bcbcf567e297 (patch) | |
tree | e37b76dc8d154ab661ab23e6be2b6b098f97e4b2 /indra/llui/lltexteditor.cpp | |
parent | 329608d24668b044e16b54ff7a7d0ac592b2b88d (diff) | |
parent | 8897e7ca24533e0093825346391f5fa9a37f2427 (diff) |
Merge. Refresh from viewer-drano-http-4 after release of 3.7.16.
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
-rwxr-xr-x | indra/llui/lltexteditor.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 576e8f7600..cf5fdef539 100755 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -1126,7 +1126,6 @@ void LLTextEditor::addChar(llwchar wc) } } - void LLTextEditor::addLineBreakChar(BOOL group_together) { if( !getEnabled() ) |