summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErica <erica@lindenlab.com>2010-01-14 13:46:26 -0800
committerErica <erica@lindenlab.com>2010-01-14 13:46:26 -0800
commit5436cdb2ee184cf4c908f351ffe8d133501f2adb (patch)
treedda402e4fd5a285be2ecf5364f34661c6a50d3b7
parent88c44993f7b96d95ebdc5f67ea8512a09d870a64 (diff)
parent9a488fea98cf4611b0a9ab985ab2431e89068435 (diff)
Automated merge with ssh://hg.lindenlab.com/james/gooey
-rw-r--r--indra/newview/skins/default/colors.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 6da38fa0d4..0117ed86f6 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -57,6 +57,9 @@
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" />
<color
@@ -460,7 +463,7 @@
reference="DkGray" />
<color
name="MenuBarGodBgColor"
- reference="Green" />
+ reference="FrogGreen" />
<color
name="MenuDefaultBgColor"
reference="DkGray2" />