diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-27 10:41:46 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-11-27 10:41:46 -0800 |
| commit | a77a49af4537ca7419947e083ae6950c1aba8330 (patch) | |
| tree | ea6613ae73a2179730e827ee49e24ff9c02aff65 /indra/newview/skins | |
| parent | 4105ae946707947e469793364e07adde7993cffe (diff) | |
| parent | 5269c6e37c17eec5b662fd57d17e6a87fdccc421 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_conversation.xml | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index 2e9bda5804..908b2c174f 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -30,12 +30,14 @@ layout="topleft" name="view_profile"> <on_click function="Avatar.DoToSelected" parameter="view_profile"/> + <on_enable function="Avatar.EnableItem" parameter="can_view_profile"/> </menu_item_call> <menu_item_call label="IM" layout="topleft" name="im"> <on_click function="Avatar.DoToSelected" parameter="im"/> + <on_enable function="Avatar.EnableItem" parameter="can_im"/> </menu_item_call> <menu_item_call label="Offer teleport" @@ -56,6 +58,7 @@ layout="topleft" name="chat_history"> <on_click function="Avatar.DoToSelected" parameter="chat_history"/> + <on_enable function="Avatar.EnableItem" parameter="can_chat_history"/> </menu_item_call> <menu_item_separator layout="topleft" name="separator_chat_history"/> <menu_item_call @@ -77,6 +80,7 @@ layout="topleft" name="invite_to_group"> <on_click function="Avatar.DoToSelected" parameter="invite_to_group" /> + <on_enable function="Avatar.EnableItem" parameter="can_invite" /> </menu_item_call> <menu_item_separator layout="topleft" name="separator_invite_to_group"/> <menu_item_call @@ -91,12 +95,14 @@ layout="topleft" name="share"> <on_click function="Avatar.DoToSelected" parameter="share" /> + <on_enable function="Avatar.EnableItem" parameter="can_share" /> </menu_item_call> <menu_item_call label="Pay" layout="topleft" name="pay"> <on_click function="Avatar.DoToSelected" parameter="pay" /> + <on_enable function="Avatar.EnableItem" parameter="can_pay" /> </menu_item_call> <menu_item_check label="Block / unblock" @@ -111,6 +117,7 @@ layout="topleft" name="group_profile"> <on_click function="Group.DoToSelected" parameter="group_profile"/> + <on_enable function="Avatar.EnableItem" parameter="can_group_profile" /> </menu_item_call> <menu_item_call label="Activate Group" @@ -124,10 +131,9 @@ layout="topleft" name="leave_group"> <on_click function="Group.DoToSelected" parameter="leave_group"/> + <on_enable function="Avatar.EnableItem" parameter="can_leave_group" /> </menu_item_call> - <menu_item_separator - layout="topleft" - name="Moderator Options Separator"/> + <menu_item_separator layout="topleft" name="Moderator Options Separator"/> <context_menu label="Moderator Options" layout="topleft" |