From d533dcebf77aa5d62c15488b3e6bed97ecffec02 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 27 Nov 2013 10:26:27 -0500
Subject: STORM-1987 Inconsistent menu naming and behavior in Places floater

---
 doc/contributions.txt                                             | 1 +
 indra/newview/llpanelteleporthistory.cpp                          | 5 +++++
 indra/newview/skins/default/xui/en/menu_teleport_history_item.xml | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2f9d0c2c86..b5f8572d9f 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -674,6 +674,7 @@ Jonathan Yap
 	OPEN-161
 	STORM-1953
 	STORM-1957
+	STORM-1987
 Kadah Coba
 	STORM-1060
     STORM-1843
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()
diff --git a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
index 0160d52b17..f939c3996d 100755
--- a/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
+++ b/indra/newview/skins/default/xui/en/menu_teleport_history_item.xml
@@ -17,7 +17,7 @@
          function="TeleportHistory.MoreInformation" />
     </menu_item_call>
     <menu_item_call
-     label="Copy to Clipboard"
+     label="Copy SLurl"
      layout="topleft"
      name="CopyToClipboard">
         <menu_item_call.on_click
-- 
cgit v1.2.3