diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-12-16 13:29:12 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-12-16 13:29:12 -0500 |
| commit | 01cdc87d0533fc0e059f6d9dc20b6d4d3077b8f3 (patch) | |
| tree | 57818befab0c24b1cbc68c283bb7cfeb749b35bc | |
| parent | a57bcc2790ecb151eb9c27c39c04ff78ad1f186a (diff) | |
| parent | d533dcebf77aa5d62c15488b3e6bed97ecffec02 (diff) | |
merge changes for storm-1987
| -rwxr-xr-x | doc/contributions.txt | 1 | ||||
| -rwxr-xr-x | indra/newview/llpanelteleporthistory.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_teleport_history_item.xml | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 1ac50c7a1e..0d9a71a416 100755 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -675,6 +675,7 @@ Jonathan Yap STORM-1953 STORM-1957 OPEN-113 + STORM-1987 STORM-1986 STORM-1981 Kadah Coba 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 |