diff options
| author | Jonathan Yap <none@none> | 2012-06-04 11:23:38 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2012-06-04 11:23:38 -0400 |
| commit | 47044de069c2c1442a33d719846cdbf1e3450124 (patch) | |
| tree | 1b1c514ce203c01835b8a60688008cf02282cc23 /indra/newview/skins/default/xui/en | |
| parent | a519e34f02b4b2663fe082ba9ad12f1b423669cb (diff) | |
STORM-1838 Add "Request Teleport" option to the menu when right-clicking on avatars in the Nearby list
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_people_nearby.xml | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 23 |
2 files changed, 30 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index d2e35e4cc0..cff383cab1 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -70,6 +70,13 @@ <menu_item_call.on_click function="Avatar.Pay" /> </menu_item_call> + <menu_item_call + label="Request Teleport" + layout="topleft" + name="Request Teleport"> + <menu_item_call.on_click + function="Avatar.RequestTeleport" /> + </menu_item_call> <menu_item_check label="Block/Unblock" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index afc5b916e7..54ba03ad59 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6149,6 +6149,29 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th Teleport offer sent to [TO_NAME] </notification> + <notification + icon="notify.tga" + name="TeleportRequest" + type="notify"> +[NAME] is requesting to be teleported your to your location. + +Will you permit this? + <tag>confirm</tag> + <form name="form"> + <button + index="0" + name="Yes" + text="Yes"/> + <button + index="1" + name="No" + text="No"/> + <button + index="2" + name="Mute" + text="Block"/> + </form> + </notification> <notification icon="notify.tga" |