livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wire up teleport request feature in Firestorm radar

Ansariel 2013-11-01 15:08:07 +01:00
parent d8d10d5979
commit 28fc276153
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/fsradarmenu.cpp
View File

@ -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));

9
indra/newview/skins/default/xui/en/menu_fs_radar.xml
View File

@ -90,6 +90,15 @@
parameter="can_offer_teleport"/>
</menu_item_call>
<menu_item_call
label="Request Teleport"
name="request_teleport">
<menu_item_call.on_click
function="Avatar.TeleportRequest"/>
<menu_item_call.on_enable
function="Avatar.EnableItem"
parameter="can_offer_teleport"/>
</menu_item_call>
<menu_item_call
label="Teleport To"
name="teleport_to">
<menu_item_call.on_click

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -7127,7 +7127,7 @@ Joining this group costs a fee and the invitation cannot be accepted because of
sound="UISndTeleportOffer">
[NAME_SLURL] has offered to teleport you to their location:
"[MESSAGE]”
“[MESSAGE]”
&lt;icon&gt;[MATURITY_ICON]&lt;/icon&gt; - [MATURITY_STR]
<tag>confirm</tag>
<form name="form">