diff options
| author | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-07-27 16:50:01 +0000 |
| commit | ca51e8f33dfa0cd455438f11902fb1d839bf6206 (patch) | |
| tree | 0e261edeab3e2e3f53a1f3ab825aa76906fff152 /indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | |
| parent | f5ba6df4c2dc5a5e0842ed028dd4de01406dca3b (diff) | |
Merge xui-army-8 to pick up 2+ weeks of art, colors, and dialog layout changes.
svn merge -r128075:128364 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/xui-army-8
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_advanced.xml')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_advanced.xml | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 2f08bb816e..624345367f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -70,45 +70,6 @@ Beware the Trout! top_pad="10" width="200" /> - <text - type="string" - length="1" - follows="left|top" - height="12" - layout="topleft" - left="30" - name="UI Size:" - top_pad="10" - width="100"> - UI Size: - </text> - <slider - can_edit_text="true" - control_name="UIScaleFactor" - decimal_digits="2" - follows="left|top" - height="15" - increment="0.025" - initial_value="1" - layout="topleft" - left_delta="0" - max_val="1.4" - min_val="0.75" - name="ui_scale_slider" - top_pad="10" - width="180" /> - <spinner - control_name="UIScaleFactor" - height="16" - increment="0.025" - initial_value="1" - layout="topleft" - left_pad="10" - max_val="1.4" - min_val="0.75" - name="ui_scale_slider" - top_delta="0" - width="58" /> <check_box control_name="UIAutoScale" height="16" |