summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-02-10 20:12:41 -0800
committerMerov Linden <merov@lindenlab.com>2014-02-10 20:12:41 -0800
commit5c82aca9104ab7b6c7cf59d270ada25053f962cd (patch)
tree8ad6ff0d5431f122a30aa622a0a795a8a24e49e2 /indra/newview/llpanelteleporthistory.cpp
parent67393b8d26a839bf75d2630aca3fc88ee7466768 (diff)
parent413be91cf5044889ade97dcbec4b17fceff122e3 (diff)
Merge pull from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpanelteleporthistory.cpp')
-rwxr-xr-xindra/newview/llpanelteleporthistory.cpp5
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()