diff --git a/indra/newview/fsradarmenu.cpp b/indra/newview/fsradarmenu.cpp index 02e014761a..e56ede42c4 100644 --- a/indra/newview/fsradarmenu.cpp +++ b/indra/newview/fsradarmenu.cpp @@ -66,6 +66,7 @@ LLContextMenu* FSRadarMenu::createMenu() registrar.add("Avatar.IM", boost::bind(&LLAvatarActions::startIM, id)); registrar.add("Avatar.Call", boost::bind(&LLAvatarActions::startCall, id)); registrar.add("Avatar.OfferTeleport", boost::bind(&FSRadarMenu::offerTeleport, this)); + registrar.add("Avatar.TeleportRequest", boost::bind(&LLAvatarActions::teleportRequest, id)); registrar.add("Avatar.GroupInvite", boost::bind(&LLAvatarActions::inviteToGroup, id)); registrar.add("Avatar.getScriptInfo", boost::bind(&LLAvatarActions::getScriptInfo, id)); registrar.add("Avatar.ShowOnMap", boost::bind(&LLAvatarActions::showOnMap, id)); diff --git a/indra/newview/skins/default/xui/en/menu_fs_radar.xml b/indra/newview/skins/default/xui/en/menu_fs_radar.xml index dbd31e585d..eecd03d31c 100644 --- a/indra/newview/skins/default/xui/en/menu_fs_radar.xml +++ b/indra/newview/skins/default/xui/en/menu_fs_radar.xml @@ -90,6 +90,15 @@ parameter="can_offer_teleport"/> + + + + [NAME_SLURL] has offered to teleport you to their location: -"[MESSAGE]” +“[MESSAGE]” <icon>[MATURITY_ICON]</icon> - [MATURITY_STR] confirm