Merged in viewer-release

1 files changed, 21 insertions, 1 deletions

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 0de217fc0d..a9176595c7 100644..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
@@ -651,6 +657,15 @@
       name="PathfindingGoodColor"
       reference="LtGreen" />
   <color
+      name="MaterialErrorColor"
+      reference="LtRed" />
+  <color
+      name="MaterialWarningColor"
+      reference="DrYellow" />
+  <color
+      name="MaterialGoodColor"
+      reference="LtGreen" />
+  <color
       name="PathfindingDefaultBeaconColor"
       reference="Red_80" />
   <color
@@ -830,9 +845,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"/>