diff options
author | Glenn Glazer <coyot@lindenlab.com> | 2017-05-23 07:59:15 -0700 |
---|---|---|
committer | Glenn Glazer <coyot@lindenlab.com> | 2017-05-23 07:59:15 -0700 |
commit | 3fda9bea31327f166dd1067f7e5c9ce251b40289 (patch) | |
tree | d7bbf85ac5d6b15ed7d5db8b8b67a1cccbaca4f9 /indra/llwindow | |
parent | 4bf1f1d618d61f0cc2ec0dd22cea7d1c5b909b8f (diff) | |
parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) |
pull from gate
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 5ec0ada6eb..1a280661b9 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; } |