From eab31cc6961a6787462f76313ee1db9871e3b0c0 Mon Sep 17 00:00:00 2001
From: Cinders <cinder@cinderblocks.biz>
Date: Thu, 28 Mar 2013 19:46:39 -0600
Subject: [PATCH] Use SchemeLightest_35 instead of EmphasisColor in Phototools
 headers because of conflict in Ectoplasma theme.

---
 .../default/xui/en/floater_phototools.xml     | 24 +++++++++----------
 .../xui/en/floater_phototools_camera.xml      |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_phototools.xml b/indra/newview/skins/default/xui/en/floater_phototools.xml
index 0e879b0ea6..9477f5b4c4 100644
--- a/indra/newview/skins/default/xui/en/floater_phototools.xml
+++ b/indra/newview/skins/default/xui/en/floater_phototools.xml
@@ -45,7 +45,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -499,7 +499,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -673,7 +673,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -1059,7 +1059,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -1293,7 +1293,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -1493,7 +1493,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -1983,7 +1983,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -2416,7 +2416,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -3291,7 +3291,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -3483,7 +3483,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -3647,7 +3647,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -4194,7 +4194,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
diff --git a/indra/newview/skins/default/xui/en/floater_phototools_camera.xml b/indra/newview/skins/default/xui/en/floater_phototools_camera.xml
index 6adb9367e7..8d7b01f91d 100644
--- a/indra/newview/skins/default/xui/en/floater_phototools_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_phototools_camera.xml
@@ -336,7 +336,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -580,7 +580,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">
@@ -676,7 +676,7 @@
 			 left="0"
 			 width="285"
 			 height="22"
-			 bg_alpha_color="EmphasisColor"
+			 bg_alpha_color="SchemeLightest_35"
 			 border_visible="true"
 			 border_thickness="1"
 			 background_visible="true">