diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-10-13 17:13:15 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-10-13 17:13:15 -0400 |
| commit | 852426d71e5b192a003d01d128799c2b702c69b1 (patch) | |
| tree | 66a31f735c3dd92f557a9026cf359ef000d548e9 /indra/llui/lltexteditor.cpp | |
| parent | 08a4d7a27743792a644c46f8163d973d0524cd79 (diff) | |
| parent | 788ce7a8cdbbbf98566ce75ec281ec00c21dc6d8 (diff) | |
merge changes for 3.7.17-release
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() ) |