summaryrefslogtreecommitdiff
path: root/indra/llui/llscrolllistctrl.cpp
diff options
context:
space:
mode:
authorcallum <none@none>2012-06-15 14:17:21 -0700
committercallum <none@none>2012-06-15 14:17:21 -0700
commit0ff6275a654eda55662fab8d89d9ff4d278438d8 (patch)
treecc9bee7b3aae707870405fa5ee58589c8d6161f3 /indra/llui/llscrolllistctrl.cpp
parent4985938269a91387e481731d469a0f1ca34e22a8 (diff)
parenta1d0d67e05c45bdc1a7a8bb0aad79772a2a94f6e (diff)
Merge with tip
Diffstat (limited to 'indra/llui/llscrolllistctrl.cpp')
-rw-r--r--indra/llui/llscrolllistctrl.cpp2
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