From 54137df1489d7d25630fe141821904b7bc73c83f Mon Sep 17 00:00:00 2001
From: Paul ProductEngine <pguslisty@productengine.com>
Date: Thu, 31 Mar 2011 21:03:41 +0300
Subject: STORM-1110 FIXED Remove old 1.23 purple text from alerts, anywhere
 else it appears

- Removed code setting purple color

- Removed "AlertTextColor" color as it's no longer needed
---
 indra/newview/lltoastalertpanel.cpp    | 5 -----
 indra/newview/skins/default/colors.xml | 3 ---
 2 files changed, 8 deletions(-)

(limited to 'indra')

diff --git a/indra/newview/lltoastalertpanel.cpp b/indra/newview/lltoastalertpanel.cpp
index 8b2f066d41..0f337825e9 100644
--- a/indra/newview/lltoastalertpanel.cpp
+++ b/indra/newview/lltoastalertpanel.cpp
@@ -220,7 +220,6 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 	}
 
 	static LLUIColor alert_caution_text_color = LLUIColorTable::instance().getColor("AlertCautionTextColor");
-	static LLUIColor alert_text_color = LLUIColorTable::instance().getColor("AlertTextColor");
 	if (mCaution)
 	{
 		LLIconCtrl* icon = LLUICtrlFactory::getInstance()->createFromFile<LLIconCtrl>("alert_icon.xml", this, LLPanel::child_registry_t::instance());
@@ -233,10 +232,6 @@ LLToastAlertPanel::LLToastAlertPanel( LLNotificationPtr notification, bool modal
 		msg_x += 32 + HPAD;
 		msg_box->setColor( alert_caution_text_color );
 	}
-	else
-	{
-		msg_box->setColor( alert_text_color );
-	}
 
 	LLRect rect;
 	rect.setLeftTopAndSize( msg_x, msg_y, text_rect.getWidth(), text_rect.getHeight() );
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index 75aec21f93..72a4dd7f63 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -114,9 +114,6 @@
     <color
      name="AlertCautionTextColor"
      reference="LtYellow" />
-    <color
-     name="AlertTextColor"
-     value="0.58 0.66 0.84 1" />
     <color
      name="AvatarListItemIconDefaultColor"
      reference="White" />
-- 
cgit v1.2.3