diff options
| author | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-06-08 15:36:42 -0700 |
| commit | 07185d300d7879fc4d8d268210fa2c440efe02f4 (patch) | |
| tree | 761fcb3e968339bc04882ea591f56af2fb175187 /indra/llwindow | |
| parent | 8d36da00c885f31739ce6bf6dbc162a6ef3a15a1 (diff) | |
| parent | cf5865c6e2b27918b526431ccc4309bfc702534e (diff) | |
Automated merge with head of lindenlab/viewer64
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; } |