From 1413404508fc418ee5a21f5e7b3e74da8f138cd9 Mon Sep 17 00:00:00 2001
From: William Todd Stinson <stinson@lindenlab.com>
Date: Wed, 29 Aug 2012 19:35:11 -0700
Subject: First pass at throwing together a test panel for the material
 capability service.

---
 indra/newview/skins/default/colors.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'indra/newview/skins/default/colors.xml')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 9bf2922033..48a9430fdc 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -644,6 +644,15 @@
   <color
       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" />
-- 
cgit v1.2.3


From cf40fc0447606fd3b435a32c5dec7b48565cae4c Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Thu, 21 Feb 2013 13:22:25 -0500
Subject: add menu bar background colors for new build/channel scheme

---
 indra/newview/skins/default/colors.xml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/colors.xml')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 9bf2922033..02e2ad2ff7 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -98,6 +98,9 @@
   <color
       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" />
@@ -107,6 +110,9 @@
   <color
       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" />
@@ -823,10 +829,15 @@
   <color
       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"/>
-- 
cgit v1.2.3


From bf6182daa8b4d7cea79310547f71d7a3155e17b0 Mon Sep 17 00:00:00 2001
From: Graham Madarasz <graham@lindenlab.com>
Date: Fri, 29 Mar 2013 07:50:08 -0700
Subject: Update Mac and Windows breakpad builds to latest

---
 indra/newview/skins/default/colors.xml | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 indra/newview/skins/default/colors.xml

(limited to 'indra/newview/skins/default/colors.xml')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
old mode 100644
new mode 100755
-- 
cgit v1.2.3