diff options
| author | Jonathan Yap <none@none> | 2013-06-05 17:32:10 -0400 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-06-05 17:32:10 -0400 |
| commit | ec52db8d0c4099dd5e3b476f7b44a4ebda7cb676 (patch) | |
| tree | 6a24cc87ca231c562d91f6a1467f6d8269119ba1 /indra/newview/skins | |
| parent | 412d553f5249b6ffeda3d7e3aba1e97d8db52b2e (diff) | |
STORM-1838 Slowly reappling changes to work with CHUI
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_conversation.xml | 9 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_people_nearby.xml | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index 5a13ef0a59..c2c15023c5 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -46,6 +46,15 @@ <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" + name="request_teleport"> + <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_people_nearby.xml b/indra/newview/skins/default/xui/en/menu_people_nearby.xml index 25b100bc94..80e8e59076 100644 --- a/indra/newview/skins/default/xui/en/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/en/menu_people_nearby.xml @@ -29,6 +29,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="Voice call" layout="topleft" name="voice_call"> |