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

2010-01-14 13:46:26 -08:00 · 2010-01-14 13:46:26 -08:00 · 5436cdb2ee
parent 88c44993f7 9a488fea98
commit 5436cdb2ee
1 changed files with 4 additions and 1 deletions
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@ -56,6 +56,9 @@
 	<color
 	 name="Black_50"
 	 value="0 0 0 0.5" />
+	<color
+	name="FrogGreen"
+	value="0.26 0.345 0.263 1" />
 	<color
 	 name="Red"
 	 value="1 0 0 1" />
@ -460,7 +463,7 @@
     reference="DkGray" />
    <color
     name="MenuBarGodBgColor"
-     reference="Green" />
+     reference="FrogGreen" />
    <color
     name="MenuDefaultBgColor"
     reference="DkGray2" />