diff options
| author | Jonathan Yap <none@none> | 2013-01-11 11:13:44 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-01-11 11:13:44 -0500 |
| commit | e386aa73b7af5ca326f66fa3fb0482e42b3af33f (patch) | |
| tree | 8548874b0dde6ca04195391eda25b706310833b5 /indra/newview/skins/default | |
| parent | 47044de069c2c1442a33d719846cdbf1e3450124 (diff) | |
STORM-1838
Diffstat (limited to 'indra/newview/skins/default')
| -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 | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/notifications.xml | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_inventory.xml b/indra/newview/skins/default/xui/en/menu_inventory.xml index b13bf5b508..051bb800e7 100644 --- a/indra/newview/skins/default/xui/en/menu_inventory.xml +++ b/indra/newview/skins/default/xui/en/menu_inventory.xml @@ -590,6 +590,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 cff383cab1..951f43f325 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -75,7 +75,7 @@ layout="topleft" name="Request Teleport"> <menu_item_call.on_click - function="Avatar.RequestTeleport" /> + function="Avatar.TeleportRequest" /> </menu_item_call> <menu_item_check label="Block/Unblock" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 54ba03ad59..f85b62c944 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6153,7 +6153,7 @@ Your object named <nolink>[OBJECTFROMNAME]</nolink> has given you th icon="notify.tga" name="TeleportRequest" type="notify"> -[NAME] is requesting to be teleported your to your location. +[NAME_SLURL] is requesting to be teleported your to your location. Will you permit this? <tag>confirm</tag> @@ -6168,8 +6168,8 @@ Will you permit this? text="No"/> <button index="2" - name="Mute" - text="Block"/> + name="IM" + text="IM"/> </form> </notification> |