diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-09-27 15:20:27 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-09-27 15:20:27 -0500 |
| commit | 7c2b9221d6678ea7a04f529efaa2e557abce504d (patch) | |
| tree | ba0095eaad5cd0e95577051222953e4c773beac4 /indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | |
| parent | e6688f993f82d2683e3eadce96c893959c94be2d (diff) | |
| parent | db85c5b327f872ba321f66726fb05b4b3c3af883 (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 7ae717d0e3..7de08d328b 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> |