diff options
| author | mnikolenko <none@none> | 2017-04-03 02:21:18 +0300 |
|---|---|---|
| committer | mnikolenko <none@none> | 2017-04-03 02:21:18 +0300 |
| commit | c27dbc62148f51ff5848f63573f5816235f0cc35 (patch) | |
| tree | 67afa02b1f2e30ab0d49388826cee3e507bf81dd /indra/llwindow | |
| parent | 7980dedc3205d2c1a7596d4cad3fa3f7fff383a5 (diff) | |
MAINT-6404 FIXED When pasting text with mac linebreak into a notecard, it shouldn't be removed
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 321792eb14..b5ed53fd4f 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2801,7 +2801,7 @@ BOOL LLWindowWin32::pasteTextFromClipboard(LLWString &dst) if (utf16str) { dst = utf16str_to_wstring(utf16str); - LLWStringUtil::removeCRLF(dst); + LLWStringUtil::removeWindowsCR(dst); GlobalUnlock(h_data); success = TRUE; } |