summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2009-11-18 09:19:02 -0800
committerJames Cook <james@lindenlab.com>2009-11-18 09:19:02 -0800
commit49ce27aa68ffb221f5be8118bffd5c98bbdb214d (patch)
treee1e5a374c2a70a1a013944d921b682338157fd25
parent1a2694f92b8dc27e8eb1b53b83e3b5201754f589 (diff)
Fix merge conflict with button fonts, use SansSerifSmall (not bold)
-rw-r--r--indra/newview/skins/default/xui/en/sidepanel_appearance.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
index 89cf9e006c..041297a542 100644
--- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
+++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml
@@ -72,7 +72,7 @@
width="80" />
<button
follows="bottom|left"
- font="SansSerifSmallBold"
+ font="SansSerifSmall"
height="25"
label="New Outfit"
layout="topleft"