diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-05-22 21:09:07 +0100 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2017-05-22 21:09:07 +0100 |
| commit | 806fd24704b69e5e51dae108952937cc05840f6c (patch) | |
| tree | 2047cbf2ad5364b5e803c06b2702216023d2d17d /indra/llwindow | |
| parent | 8528a9ae131dff09865eccd672efce621571c5e5 (diff) | |
| parent | 48af8529a80052e9bc42f81f36896739f8aff861 (diff) | |
merge
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; } |