diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-25 16:11:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-25 16:11:04 -0400 |
| commit | d7e041d0c7a6f5e19b12efb434a722d6b4969b24 (patch) | |
| tree | 8e3d92d76dc38687ddbd05ad2791ed845c95fdc7 /indra/llui/lltexteditor.cpp | |
| parent | 1057caffaf24790be26376b2794059e7635dde7b (diff) | |
correct merge error
Diffstat (limited to 'indra/llui/lltexteditor.cpp')
| -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 |