diff options
author | simon <none@none> | 2014-02-10 15:42:25 -0800 |
---|---|---|
committer | simon <none@none> | 2014-02-10 15:42:25 -0800 |
commit | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (patch) | |
tree | 9decb3ccc69bfee8fcaeb583bf0c6f6afd7b1243 /indra/newview/llpanelteleporthistory.cpp | |
parent | 1be85e1a0a2a2d607c74acb684412b6c3b307e6f (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Merge viewer-release
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
-rwxr-xr-x | indra/newview/llpanelteleporthistory.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llpanelteleporthistory.cpp b/indra/newview/llpanelteleporthistory.cpp index 0756faf5c0..9c380f63bd 100755 --- a/indra/newview/llpanelteleporthistory.cpp +++ b/indra/newview/llpanelteleporthistory.cpp @@ -359,6 +359,11 @@ void LLTeleportHistoryPanel::ContextMenu::onInfo() void LLTeleportHistoryPanel::ContextMenu::gotSLURLCallback(const std::string& slurl) { LLClipboard::instance().copyToClipboard(utf8str_to_wstring(slurl),0,slurl.size()); + + LLSD args; + args["SLURL"] = slurl; + + LLNotificationsUtil::add("CopySLURL", args); } void LLTeleportHistoryPanel::ContextMenu::onCopyToClipboard() |