From c27dbc62148f51ff5848f63573f5816235f0cc35 Mon Sep 17 00:00:00 2001
From: mnikolenko <none@none>
Date: Mon, 3 Apr 2017 02:21:18 +0300
Subject: MAINT-6404 FIXED When pasting text with mac linebreak into a
notecard, it shouldn't be removed
---
indra/llwindow/llwindowwin32.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'indra/llwindow')
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;
}
--
cgit v1.2.3