diff options
| author | Jonathan Yap <jhwelch@gmail.com> | 2014-12-04 14:27:15 -0500 |
|---|---|---|
| committer | Jonathan Yap <jhwelch@gmail.com> | 2014-12-04 14:27:15 -0500 |
| commit | 5be238b127ff30f09105ad6f0d9b8ee3dec8b40f (patch) | |
| tree | be861b92822552895d59c7a0e718d9dac83264c5 /indra/newview/skins | |
| parent | 9785a88ba447087fb547794430f24d7513909cbe (diff) | |
STORM-2082 Revert name of Reset button from Undo back to Reset. Hopefully this will be renamed Recommended Settings.
Display a test icon (artwork needed) in the pulldown panel
Diffstat (limited to 'indra/newview/skins')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 16 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_presets_pulldown.xml | 8 |
2 files changed, 5 insertions, 19 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index 6df4a4f2ea..24f3dd803f 100755 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -37,7 +37,7 @@ <button follows="top|left" height="23" - label="SaveAs..." + label="Save As..." layout="topleft" left_pad="5" name="PrefSaveButton" @@ -949,7 +949,7 @@ <button follows="left|bottom" height="23" - label="Undo" + label="Recommended Settings" layout="topleft" left="10" name="Defaults" @@ -959,18 +959,6 @@ function="Pref.HardwareDefaults" /> </button> <button - follows="left|bottom" - height="23" - label="Recommended Settings" - layout="topleft" - left_pad="5" - name="Recommended" - top="310" - width="190"> - <button.commit_callback - function="Pref.Recommended" /> - </button> - <button follows="right|bottom" height="23" label="Hardware..." diff --git a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml index 652d85656c..fdcbce05d2 100644 --- a/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_presets_pulldown.xml @@ -38,12 +38,10 @@ left_delta="0" name="preset_list"> <scroll_list.columns - width="10" - label="Active" - name="active_name" /> + name="icon" + width="16" /> <scroll_list.columns - width="200" - label="Preset Name" + relative_width="1" name="preset_name" /> <scroll_list.commit_callback function="Presets.RowClick" /> |