diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-25 15:24:59 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-25 15:24:59 -0400 |
| commit | 2b2719d8cae1e35fa9e4cfcb87519bae9a64b2bf (patch) | |
| tree | b5ad4f295254a9425ad9130887ffd39ff6076c59 /indra | |
| parent | 6f2fef886e160d3378a0cf353a7db7eff707e9bf (diff) | |
correct merge failure
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llui/lltexteditor.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/llui/lltexteditor.cpp b/indra/llui/lltexteditor.cpp index 4a950638a4..57446e9c56 100644 --- a/indra/llui/lltexteditor.cpp +++ b/indra/llui/lltexteditor.cpp @@ -1501,11 +1501,6 @@ void LLTextEditor::pasteTextWithLinebreaks(LLWString & clean_string) { addLineBreakChar(FALSE); // Add a line break and end the grouping. } - } - else - { - addLineBreakChar(FALSE); // Add a line break and end the grouping. - } } // copy selection to primary |