summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/widgets
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-01-20 15:44:54 -0500
committerChuck Linden <chuck@lindenlab.com>2010-01-20 15:44:54 -0500
commita67670dee61f361e27fb0a56ad2fbb3e2acf4523 (patch)
tree57e8ae0ee7589c2dac1a4f7ce909e99fc4598173 /indra/newview/skins/default/xui/en/widgets
parent41f2b8e6017c4846430f501dc3d4877b505b9fbd (diff)
parent1f0470e33404408c6228c9d0e3753f7ba43d3d96 (diff)
Automated merge with ssh://hg.lindenlab.com/james/gooey/
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/color_swatch.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/color_swatch.xml b/indra/newview/skins/default/xui/en/widgets/color_swatch.xml
index bda88857ae..dfd301a770 100644
--- 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>