diff options
author | Cho <cho@lindenlab.com> | 2014-08-20 01:11:55 +0100 |
---|---|---|
committer | Cho <cho@lindenlab.com> | 2014-08-20 01:11:55 +0100 |
commit | d071aeb6f1ff0d98e27e93391f004d6ff947e3b1 (patch) | |
tree | faa6d458733c4f6288974ab370d7f480ed73a17c /indra/newview/skins/default/xui/en/menu_object.xml | |
parent | 89eac2548a9b66d8bab27a7e8d7d1ed2159e9515 (diff) | |
parent | d576e66210c020a8a86bcc88898a352bc0875d9a (diff) |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/menu_object.xml')
-rwxr-xr-x | indra/newview/skins/default/xui/en/menu_object.xml | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 52ab7da515..5c98a98d3d 100755 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -130,17 +130,24 @@ function="Object.ReportAbuse" /> <menu_item_call.on_enable function="Object.EnableReportAbuse" /> - </menu_item_call> + </menu_item_call> <menu_item_call - enabled="false" - label="Block" - name="Object Mute"> - <menu_item_call.on_click + label="Block" + name="Object Mute"> + <menu_item_call.on_click function="Object.Mute" /> - <menu_item_call.on_enable + <menu_item_call.on_visible function="Object.EnableMute" /> </menu_item_call> <menu_item_call + label="Unblock" + name="Object Unmute"> + <menu_item_call.on_click + function="Object.Mute" /> + <menu_item_call.on_visible + function="Object.EnableUnmute" /> + </menu_item_call> + <menu_item_call enabled="false" label="Return" name="Return..."> |