diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-02-12 15:03:21 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-02-12 15:03:21 -0800 |
| commit | 2e6a6c7ac4c40a27569ca77ea169be546160f7bc (patch) | |
| tree | 09ab5583512c4f446328a1fbd4628558b28dd748 /indra/newview/skins | |
| parent | dbd6b58bf26e6989f95eb6ef4ff3870da7a514d3 (diff) | |
| parent | 94ae64d6fd30e4dbc3280cd277f772c038ccd9fe (diff) | |
Merge downstream code (viewer-lion and viewer-release)
Diffstat (limited to 'indra/newview/skins')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 13 |
1 files changed, 13 insertions, 0 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 01083a9d5d..4ed95f0758 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -158,6 +158,19 @@ halign="center" height="12" layout="topleft" + left_delta="87" + name="ShadersPrefText3" + top_delta="0" + width="80"> + High + </text> + <text + type="string" + length="1" + follows="left|top" + halign="center" + height="12" + layout="topleft" left_delta="85" name="ShadersPrefText4" top_delta="0" |