diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-07-14 11:11:31 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-07-14 11:11:31 -0500 |
| commit | 13202e744c35f0c6154cd0b582b1834896cacb79 (patch) | |
| tree | 6a78237dd74c6270201afb6921e34e0b81dcfad5 /indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | |
| parent | b46fff1ba1450d14424e676f31c0cacd921bedb0 (diff) | |
| parent | 2dd3a6be720ed6ce7c17415fc8d81869cf46f3a0 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 7 |
1 files changed, 3 insertions, 4 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 113d5fb6dc..eb9c12be4f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -211,7 +211,6 @@ <check_box.commit_callback function="Pref.VertexShaderEnable" /> </check_box> -<!-- DISABLED UNTIL WE REALLY WANT TO SUPPORT THIS <check_box control_name="RenderDeferred" height="16" @@ -273,7 +272,7 @@ name="2" value="2"/> </combo_box> ---> + <text type="string" length="1" @@ -614,9 +613,9 @@ follows="left|top" height="12" layout="topleft" - left_delta="-260" + left="200" name="AvatarRenderingText" - top_pad="18" + top_pad="8" width="128"> Avatar rendering: </text> |