diff options
| author | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-02-12 15:06:04 -0800 |
|---|---|---|
| committer | simon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com> | 2013-02-12 15:06:04 -0800 |
| commit | d706766baeb0f88ce359713a16fc685efc5c86b6 (patch) | |
| tree | 876d5f21b2bb24f0f8f28b618ca865531c85ead3 /indra/newview/skins/default/xui | |
| parent | f7c57fe1715368f23b716c5591afe6cb7feb34bf (diff) | |
| parent | 2e6a6c7ac4c40a27569ca77ea169be546160f7bc (diff) | |
Merge downstream code (viewer-bear, lion and release)
Diffstat (limited to 'indra/newview/skins/default/xui')
| -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" |