diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-26 17:06:07 -0400 |
commit | a4913246770b58ed569021c484c213231aaae549 (patch) | |
tree | 0878deeaa86b2c3a28cbf325566e8489111523c1 /indra/llui/llscrolllistctrl.cpp | |
parent | 80c2abddcfbcb578e70d220baa95aebdee3d529c (diff) | |
parent | b2b446aed7f7f32151bc152ba25d44253ebf864f (diff) |
merge up to latest 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 |