diff options
author | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2012-03-22 10:58:04 -0700 |
commit | d6d1cb852d014dd002656ed35537975ebb6300b0 (patch) | |
tree | 0e432c855eb3105e2c1e2bd67a3010b6c73f7b50 /indra/llui/llscrolllistctrl.cpp | |
parent | b187aeb8f177bd76e792652e773617beff18b47b (diff) | |
parent | 71db6d1b91cb8a62959a63ae36d3727e48439245 (diff) |
Automated merge with http://hg.secondlife.com/viewer-release
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r-- | indra/llui/llscrolllistctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llscrolllistctrl.cpp b/indra/llui/llscrolllistctrl.cpp index 466fac33ea..b3e1b63db5 100644 --- a/indra/llui/llscrolllistctrl.cpp +++ b/indra/llui/llscrolllistctrl.cpp @@ -2504,7 +2504,7 @@ void LLScrollListCtrl::copy() { buffer += (*itor)->getContentsCSV() + "\n"; } - gClipboard.copyFromSubstring(utf8str_to_wstring(buffer), 0, buffer.length()); + LLClipboard::instance().copyToClipboard(utf8str_to_wstring(buffer), 0, buffer.length()); } // virtual |