diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-25 16:11:38 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-25 16:11:38 -0400 |
| commit | 716aef71c46ea3d33157d7007172d140040bd19c (patch) | |
| tree | 137ad18b022cf929b27580016e3497d894de71b2 /indra | |
| parent | 76f8d755b0131c5926927a33cc9df67132ee9d3e (diff) | |
| parent | d7e041d0c7a6f5e19b12efb434a722d6b4969b24 (diff) | |
merge changes for storm-1855
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 |