Automated merge with ssh://hg.lindenlab.com/james/gooey/

2010-01-20 15:44:54 -05:00 · 2010-01-20 15:44:54 -05:00 · a67670dee6
parent 41f2b8e601 1f0470e334
commit a67670dee6
2 changed files with 867 additions and 905 deletions
--- a/indra/newview/skins/default/xui/en/floater_customize.xml
+++ b/indra/newview/skins/default/xui/en/floater_customize.xml
--- a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
+++ b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
@ -3,6 +3,6 @@
              border_color="ColorSwatchBorderColor"
              name="color_swatch">
  <color_swatch.caption_text name="caption"
-                             font="SansSerifSmall"
+                             halign="center"
                             follows="left|right|bottom"/>
 </color_swatch>