diff options
| author | andreykproductengine <akleshchev@productengine.com> | 2016-05-18 19:29:31 +0300 |
|---|---|---|
| committer | andreykproductengine <akleshchev@productengine.com> | 2016-05-18 19:29:31 +0300 |
| commit | efa716b5fcaa0f0faa4003e072747898a223e983 (patch) | |
| tree | d2febedf61a98fc08535c3ad8f59137ec244aec1 /indra/newview/skins | |
| parent | 9ffc67ef8498823db2dc386ebdd0812fe4f54cb8 (diff) | |
MAINT-2129 "Block" button doesn't become disabled
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_object_icon.xml | 15 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_url_objectim.xml | 7 |
2 files changed, 20 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_object_icon.xml b/indra/newview/skins/default/xui/en/menu_object_icon.xml index 93093014eb..5137aea72a 100644 --- a/indra/newview/skins/default/xui/en/menu_object_icon.xml +++ b/indra/newview/skins/default/xui/en/menu_object_icon.xml @@ -23,8 +23,19 @@ <menu_item_call.on_click function="ObjectIcon.Action" parameter="block" /> - <menu_item_call.on_enable - function="ObjectIcon.Enable" + <menu_item_call.on_visible + function="ObjectIcon.Visible" + parameter="not_blocked" /> + </menu_item_call> + <menu_item_call + label="Unblock" + layout="topleft" + name="Unblock"> + <menu_item_call.on_click + function="ObjectIcon.Action" + parameter="unblock" /> + <menu_item_call.on_visible + function="ObjectIcon.Visible" parameter="is_blocked" /> </menu_item_call> <menu_item_separator diff --git a/indra/newview/skins/default/xui/en/menu_url_objectim.xml b/indra/newview/skins/default/xui/en/menu_url_objectim.xml index b9d003b841..41d40b389a 100644 --- a/indra/newview/skins/default/xui/en/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/en/menu_url_objectim.xml @@ -16,6 +16,13 @@ <menu_item_call.on_click function="Url.Block" /> </menu_item_call> + <menu_item_call + label="Unblock" + layout="topleft" + name="unblock_object"> + <menu_item_call.on_click + function="Url.Unblock" /> + </menu_item_call> <menu_item_separator layout="topleft" /> <menu_item_call |