merge

2011-01-17 09:42:02 -05:00 · 2011-01-17 09:42:02 -05:00 · a8998bf37b
parent 79f2fac886 9305a31a3d
commit a8998bf37b
2 changed files with 2 additions and 3707 deletions
--- a/indra/newview/skins/firestorm/colors.xml
+++ b/indra/newview/skins/firestorm/colors.xml
@ -355,7 +355,7 @@
     reference="AvatarListItemIconOfflineColor" />
    <color
     name="BackgroundChatColor"
-     reference="DkGray" />
+     reference="ltgrey123" />
    <color
     name="ButtonBorderColor"
     reference="Unused?" />
@ -367,7 +367,7 @@
     reference="Unused?" />
    <color
     name="ButtonFlashBgColor"
-     reference="Unused?" />
+     reference="White" />
 <!-- Color Changed -->
    <color
     name="ButtonImageColor"
--- a/indra/newview/skins/firestorm/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/firestorm/xui/en/menu_viewer.xml