summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelteleporthistory.cpp
diff options
context:
space:
mode:
authorTank_Master <tank.master@phoenixviewer.com>2014-03-10 12:07:59 -0700
committerTank_Master <tank.master@phoenixviewer.com>2014-03-10 12:07:59 -0700
commit328f64b4b9b870661a6d0bb8947dc1ff410ca0f8 (patch)
tree769bd24c2300307846e316e230db5dadb641611a /indra/newview/llpanelteleporthistory.cpp
parent061eee57d9a56bd50fbe2a8f84b3cff99f63ebfc (diff)
parent1ad94b5a9a8d0b6d095938148cbf8b1b56a778bf (diff)
Merge
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()