merge changes for storm-1987

2013-11-27 12:02:04 -05:00 · 2013-11-27 12:02:04 -05:00 · 0c6d06692e
parent ced4ccdbd2 d533dcebf7
commit 0c6d06692e
3 changed files with 7 additions and 1 deletions
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@ -679,6 +679,7 @@ Jonathan Yap
 	STORM-1953
 	STORM-1957
 	STORM-1975
+	STORM-1987
 	STORM-1982
 Kadah Coba
 	STORM-1060
--- 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()
--- 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