merge changes for storm-1987

doc/contributions.txt

@@ -675,6 +675,7 @@ Jonathan Yap
 	STORM-1953
 	STORM-1957
 	OPEN-113
+	STORM-1987
 	STORM-1986
 	STORM-1981
 Kadah Coba

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()

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