summaryrefslogtreecommitdiff
path: root/indra/newview/llurllineeditorctrl.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-26 17:06:07 -0400
committerOz Linden <oz@lindenlab.com>2012-05-26 17:06:07 -0400
commita4913246770b58ed569021c484c213231aaae549 (patch)
tree0878deeaa86b2c3a28cbf325566e8489111523c1 /indra/newview/llurllineeditorctrl.cpp
parent80c2abddcfbcb578e70d220baa95aebdee3d529c (diff)
parentb2b446aed7f7f32151bc152ba25d44253ebf864f (diff)
merge up to latest viewer-release
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());
}