diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-04 16:22:01 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-04 16:22:01 +0000 |
| commit | d1d248973d577d314bba16dc9f2977a7125b5f0d (patch) | |
| tree | 6472b8a161224072ddde6ad5ffbc001fcc0dd028 /indra/newview/skins/default/xui | |
| parent | 5b11cad690ba03f1afe3763f4c1cfc125796796c (diff) | |
| parent | a4c49904c67e123df0d8e1f68714cf13acfa1ffc (diff) | |
Merged in andreykproductengine/maint-eep2 (pull request #68)
MAINT-8989 Menu updates button instead of executing command
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_save_settings.xml | 54 |
2 files changed, 37 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index e553948d9d..c8843db28b 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -538,7 +538,7 @@ Select a key frame from the timeline above to edit settings. left="5" top_pad="0" name="save_btn" - width="150" /> + width="156" /> <button follows="top|left" diff --git a/indra/newview/skins/default/xui/en/menu_save_settings.xml b/indra/newview/skins/default/xui/en/menu_save_settings.xml index e3ed9a1741..84dacaa8b8 100644 --- a/indra/newview/skins/default/xui/en/menu_save_settings.xml +++ b/indra/newview/skins/default/xui/en/menu_save_settings.xml @@ -5,46 +5,64 @@ mouse_opaque="false" name="save_settings_menu" width="120"> - <menu_item_call + <menu_item_check name="save_settings" label="Save"> - <menu_item_call.on_click + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="save" /> + <menu_item_check.on_click function="FlyoutCombo.Button.Action" userdata="save"/> - </menu_item_call> - <menu_item_call + </menu_item_check> + <menu_item_check name="save_as_new_settings" label="Save As"> - <menu_item_call.on_click + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="saveas" /> + <menu_item_check.on_click function="FlyoutCombo.Button.Action" userdata="saveas" /> - </menu_item_call> - <menu_item_call + </menu_item_check> + <menu_item_check name="commit_changes" label="Commit"> - <menu_item_call.on_click + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="commit" /> + <menu_item_check.on_click function="FlyoutCombo.Button.Action" userdata="commit" /> - </menu_item_call> - <menu_item_call + </menu_item_check> + <menu_item_check name="apply_local" label="Apply Only To Myself"> - <menu_item_call.on_click + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="local" /> + <menu_item_check.on_click function="FlyoutCombo.Button.Action" userdata="local" /> - </menu_item_call> - <menu_item_call + </menu_item_check> + <menu_item_check name="apply_parcel" label="Apply To Parcel"> - <menu_item_call.on_click + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="parcel" /> + <menu_item_check.on_click function="FlyoutCombo.Button.Action" userdata="parcel" /> - </menu_item_call> - <menu_item_call + </menu_item_check> + <menu_item_check name="apply_region" label="Apply To Region"> - <menu_item_call.on_click + <menu_item_check.on_check + function="FlyoutCombo.Button.Check" + userdata="region" /> + <menu_item_check.on_click function="FlyoutCombo.Button.Action" userdata="region" /> - </menu_item_call> + </menu_item_check> </toggleable_menu> |