diff options
author | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
---|---|---|
committer | Monty Brandenberg <monty@lindenlab.com> | 2014-09-22 17:11:17 -0400 |
commit | 8897e7ca24533e0093825346391f5fa9a37f2427 (patch) | |
tree | 781b08a7a90e53124d4f11b507be4d726544f0f0 /indra/llui/lltexteditor.cpp | |
parent | 79ab7c20703c092a4416a4f9a885e0246fc17ee0 (diff) | |
parent | 499f5aa9a4b46d61ee94b26d5c86bc032766af70 (diff) |
Merge. Refresh from viewer-release after 3.7.16 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() ) |