diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-12 20:36:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-12 20:36:21 -0400 |
| commit | cba11e7195e3a8572177f005af999a2d8b3fb442 (patch) | |
| tree | e3977456cdc01a9f9527a9da26136466a9a5f87f | |
| parent | c857064af23292dfc4609fec6d22927ba8bd9dba (diff) | |
| parent | 54137df1489d7d25630fe141821904b7bc73c83f (diff) | |
merge changes for storm-1110
| -rw-r--r-- | indra/newview/lltoastalertpanel.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 3 |
2 files changed, 0 insertions, 8 deletions
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 @@ -115,9 +115,6 @@ name="AlertCautionTextColor" reference="LtYellow" /> <color - name="AlertTextColor" - value="0.58 0.66 0.84 1" /> - <color name="AvatarListItemIconDefaultColor" reference="White" /> <color |