summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLis Pardi <lis@lindenlab.com>2009-11-24 15:23:22 -0500
committerLis Pardi <lis@lindenlab.com>2009-11-24 15:23:22 -0500
commit9e9a6e5c0ebefb010a51ee88445876f9557b063c (patch)
tree2e4ebf72b83b540db519fdf6104f8b30384c51c3
parent179582a195ae438da918448204aa6a58a45b9a2c (diff)
parent724950bac94d1615fe3ea9bd1e9a163473871477 (diff)
Automated merge with ssh://lis@hg.lindenlab.com/james/gooey
-rw-r--r--indra/newview/skins/default/xui/en/widgets/button.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml
index 7c54e618ef..28ed560543 100644
--- a/indra/newview/skins/default/xui/en/widgets/button.xml
+++ b/indra/newview/skins/default/xui/en/widgets/button.xml
@@ -15,6 +15,7 @@
image_color="ButtonImageColor"
image_color_disabled="ButtonImageColor"
flash_color="ButtonFlashBgColor"
+ font="SansSerifSmall"
hover_glow_amount="0.15"
halign="center"
scale_image="true">