summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/colors.xml
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-12-01 12:52:21 -0500
committerLoren Shih <seraph@lindenlab.com>2009-12-01 12:52:21 -0500
commit27351b8bf59c3b2cfc31c27947397055a40b52d7 (patch)
tree6720e5dc77c8fee7f7fdecb46f220fb30247efb0 /indra/newview/skins/default/colors.xml
parentc361ee133761412acf766f6680b14e29e60f8a1e (diff)
parent677938e6531209ca9ccd29146454af67f1c743c7 (diff)
automated merge for viewer-2.0 -> avp.
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rw-r--r--indra/newview/skins/default/colors.xml7
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index eb8ec00bb9..295f4259fd 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -81,7 +81,7 @@
<color
name="AgentChatColor"
- reference="LtGray" />
+ reference="White" />
<color
name="AlertBoxColor"
value="0.24 0.24 0.24 1" />
@@ -669,7 +669,7 @@
reference="LtGray" />
<color
name="UserChatColor"
- reference="LtGray" />
+ reference="White" />
<color
name="llOwnerSayChatColor"
reference="LtGray" />
@@ -684,5 +684,8 @@
<color
name="SysWellItemSelected"
value="0.3 0.3 0.3 1.0" />
+ <color
+ name="ChatToastAgentNameColor"
+ value="1.0 0.3 1.0 1.0" />
</colors>