summaryrefslogtreecommitdiff
path: root/indra/newview/llurllineeditorctrl.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/newview/llurllineeditorctrl.cpp
parent4985938269a91387e481731d469a0f1ca34e22a8 (diff)
parenta1d0d67e05c45bdc1a7a8bb0aad79772a2a94f6e (diff)
Merge with tip
Diffstat (limited to 'indra/newview/llurllineeditorctrl.cpp')
-rw-r--r--indra/newview/llurllineeditorctrl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llurllineeditorctrl.cpp b/indra/newview/llurllineeditorctrl.cpp
index 56b5bbf942..cad5769042 100644
--- a/indra/newview/llurllineeditorctrl.cpp
+++ b/indra/newview/llurllineeditorctrl.cpp
@@ -89,5 +89,5 @@ void LLURLLineEditor::copyEscapedURLToClipboard()
else // human-readable location
text_to_copy = utf8str_to_wstring(unescaped_text);
- gClipboard.copyFromString( text_to_copy );
+ LLClipboard::instance().copyToClipboard(text_to_copy, 0, text_to_copy.size());
}