diff options
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index c2c15023c5..d8eb2f0ffd 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -46,7 +46,6 @@ <on_click function="Avatar.DoToSelected" parameter="offer_teleport"/> <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/> </menu_item_call> - <menu_item_call label="Request teleport" layout="topleft" @@ -54,7 +53,6 @@ <on_click function="Avatar.DoToSelected" parameter="request_teleport"/> <on_enable function="Avatar.EnableItem" parameter="can_offer_teleport"/> </menu_item_call> - <menu_item_call label="Voice call" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml index 8796b87955..a1a3afbf68 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml @@ -56,6 +56,16 @@ function="Calllog.Enable" parameter="can_offer_teleport"/> </menu_item_call> + <menu_item_call + label="Request Teleport" + name="request_teleport"> + <on_click + function="Calllog.Action" + parameter="request_teleport"/> + <on_enable + function="Calllog.Enable" + parameter="can_offer_teleport"/> + </menu_item_call> <menu_item_separator /> <menu_item_call label="Add Friend" diff --git a/indra/newview/skins/default/xui/en/notifications.xml b/indra/newview/skins/default/xui/en/notifications.xml index 31e3e7fc30..3a01084b9a 100644 --- a/indra/newview/skins/default/xui/en/notifications.xml +++ b/indra/newview/skins/default/xui/en/notifications.xml @@ -6630,6 +6630,7 @@ However, this region contains content accessible to adults only. <notification icon="notify.tga" name="TeleportRequest" + log_to_im="true" type="offer"> [NAME_SLURL] is requesting to be teleported to your location. [MESSAGE] |