summaryrefslogtreecommitdiff
path: root/indra/newview/llurllineeditorctrl.cpp
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-03-22 10:58:04 -0700
committerRichard Linden <none@none>2012-03-22 10:58:04 -0700
commitd6d1cb852d014dd002656ed35537975ebb6300b0 (patch)
tree0e432c855eb3105e2c1e2bd67a3010b6c73f7b50 /indra/newview/llurllineeditorctrl.cpp
parentb187aeb8f177bd76e792652e773617beff18b47b (diff)
parent71db6d1b91cb8a62959a63ae36d3727e48439245 (diff)
Automated merge with http://hg.secondlife.com/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());
}