diff options
| author | mberezhnoy <mberezhnoy@productengine.com> | 2013-06-07 19:34:34 +0300 |
|---|---|---|
| committer | mberezhnoy <mberezhnoy@productengine.com> | 2013-06-07 19:34:34 +0300 |
| commit | 15b6a395d00d55c50e98c86498669bd06782cb15 (patch) | |
| tree | 0a64d37e2b21c5e084d7855be7128c28f458ac89 /indra/newview/skins/default/xui | |
| parent | 57b21335ba232d4023ec2cda81153d02bc190f6b (diff) | |
| parent | 0bcb1db3ea8056e96b6cb087758e6ee57bc122a3 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/menu_conversation.xml | 14 | ||||
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_setup.xml | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index 7494309315..b3d28788da 100755 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -11,13 +11,7 @@ layout="topleft" name="close_conversation"> <on_click function="Avatar.DoToSelected" parameter="close_conversation"/> - </menu_item_call> - <menu_item_call - label="Close All conversations" - layout="topleft" - name="close_all_conversations"> - <on_click function="Avatar.DoToSelected" parameter="close_all_conversations"/> - </menu_item_call> + </menu_item_call> <menu_item_call label="Open voice conversation" layout="topleft" @@ -31,6 +25,12 @@ <on_click function="Avatar.DoToSelected" parameter="disconnect_from_voice"/> </menu_item_call> <menu_item_separator layout="topleft" name="separator_disconnect_from_voice"/> + <menu_item_call + label="Close Selected" + layout="topleft" + name="close_selected_conversations"> + <on_click function="Avatar.DoToSelected" parameter="close_selected_conversations"/> + </menu_item_call> <menu_item_call label="View Profile" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml index 2fb6a9fd40..dd4533ae74 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_setup.xml @@ -237,8 +237,7 @@ enabled="true" follows="left|top" height="14" - initial_value="true" - control_name="UpdateWillingToTest" + control_name="UpdaterWillingToTest" label="Willing to update to release candidates" left_delta="0" mouse_opaque="true" |