diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-01-18 16:37:07 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-01-18 16:37:07 -0500 |
| commit | 3e3fda589b11d53fceb9bbeed9f0333d88c3816f (patch) | |
| tree | 43bfd5e88ede272242db36d9000fcdac84541725 /indra/newview/skins | |
| parent | d16757545c91d4f7dac3c52a311ad0f0239052e1 (diff) | |
| parent | 70722454f6650438c9b659ff08b4d7bc6dfc2e7e (diff) | |
merge up to 3.4.4-release
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_inventory.xml | 6 | ||||
| -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 |
3 files changed, 36 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index 13dc0b941a..ef315e1a8d 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -598,6 +598,12 @@ function="Inventory.BeginIMSession" parameter="selected" /> </menu_item_call> + <menu_item_call + label="Request Teleport" + name="Request Teleport"> + <menu_item_call.on_click + function="Avatar.TeleportRequest" /> + </menu_item_call> <menu_item_separator layout="topleft" name="Gesture Separator" /> 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..951f43f325 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.TeleportRequest" /> + </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 9dae77a304..0628e54902 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6515,6 +6515,29 @@ However, this region contains content accessible to adults only. Teleport offer sent to [TO_NAME] </notification> + <notification + icon="notify.tga" + name="TeleportRequest" + type="notify"> +[NAME_SLURL] 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="IM" + text="IM"/> + </form> + </notification> <notification icon="notify.tga" |