diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-11-27 12:02:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-11-27 12:02:04 -0500 |
| commit | 0c6d06692e358a20f80e563b0f1df1fcff452f68 (patch) | |
| tree | e2551ba937bfc2c3d51b0944ce420388a38fbe63 | |
| parent | ced4ccdbd295216e57755b81b5b04df5b6022d4d (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 da0a0c684f..e4ee2141a8 100755 --- 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 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 |