diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-03-01 18:09:04 -0800 |
commit | 1147cb1afbc21e1251614895844e95bca9b6b5bc (patch) | |
tree | da01f6c0e6b61a7c0637a371c946ea69b46f9dff /indra/newview/skins/default/xui/en/menu_object.xml | |
parent | b11a625e6ff89470d25273fa426ed13f7abc4a6a (diff) | |
parent | 0600083891ab5b2c6a79097f65945bcb2d049bed (diff) |
Automated merge from trunk
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_object.xml')
-rw-r--r-- | indra/newview/skins/default/xui/en/menu_object.xml | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 9436b2cd73..2c97112e38 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -44,11 +44,24 @@ name="Object Sit"> <menu_item_call.on_click function="Object.SitOrStand" /> + <menu_item_call.on_visible + function="Object.SitVisible" /> <menu_item_call.on_enable function="Object.EnableSitOrStand" - name="EnableSitOrStand" - parameter="Sit Here,Stand Up" /> - </menu_item_call> + name="EnableSitOrStand" /> + </menu_item_call> + <menu_item_call + enabled="false" + label="Stand Up" + name="Object Stand Up"> + <menu_item_call.on_click + function="Object.SitOrStand" /> + <menu_item_call.on_visible + function="Object.StandUpVisible" /> + <menu_item_call.on_enable + function="Object.EnableSitOrStand" + name="EnableSitOrStand" /> + </menu_item_call> <menu_item_call label="Object Profile" name="Object Inspect"> |