diff options
author | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
commit | 2e948a8dc678d3bb5f1d4f34a04efac79b952187 (patch) | |
tree | 601637c76d2118a803ee79f91339453e1bc5f676 /indra/newview/llpanelteleporthistory.cpp | |
parent | bd800bc2efbba57b66c4a776ac399b3680d184b5 (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Pull merge from lindenlab/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() |