diff options
| author | max nikolenko <maximnproductengine@lindenlab.com> | 2017-04-04 08:01:00 +0000 |
|---|---|---|
| committer | max nikolenko <maximnproductengine@lindenlab.com> | 2017-04-04 08:01:00 +0000 |
| commit | ab927f7991acb9fb0b005f786b21cfe073192c2e (patch) | |
| tree | 83543a6dc0b0931c26016858eb8199b21792c765 /indra/llwindow | |
| parent | 96f436b6500d6d6fbcf6eb782fa6f913a5b2b59a (diff) | |
| parent | c27dbc62148f51ff5848f63573f5816235f0cc35 (diff) | |
Merged in MAINT-6404
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; } |