summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/colors.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-04-30 08:57:29 -0400
committerOz Linden <oz@lindenlab.com>2013-04-30 08:57:29 -0400
commit889d02b52d9d53b59e1bab953b8e19a60c49fd4f (patch)
tree7991f8b9b0972027cc2bc7301a99779e9850141f /indra/newview/skins/default/colors.xml
parentca7de31a6c5031bb928d283362e96bb63e37ce85 (diff)
parent2ef8fc41e74b6949e02a7715b2b8399094ebd3ea (diff)
merge changes for CHOP-913
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rwxr-xr-xindra/newview/skins/default/colors.xml13
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0de217fc0d..42568775d9 100755
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -102,6 +102,9 @@
name="MdBlue"
value=".07 .38 .51 1" />
<color
+ name="DkBlue"
+ value=".06 .06 .3 1" />
+ <color
name="LtRed"
value="1 0.2 0.2 1" />
<color
@@ -111,6 +114,9 @@
name="Red_80"
value="1 0 0 0.8" />
<color
+ name="DkRed"
+ value="0.3 0.06 0.06 1" />
+ <color
name="Green_80"
value="0 1 0 0.8" />
<color
@@ -830,9 +836,14 @@
name="ChatTimestampColor"
reference="White" />
<color
+ name="MenuBarBetaBgColor"
+ reference="DkBlue" />
+ <color
name="MenuBarProjectBgColor"
reference="MdBlue" />
-
+ <color
+ name="MenuBarTestBgColor"
+ reference="DkRed" />
<color
name="MeshImportTableNormalColor"
value="1 1 1 1"/>