summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/colors.xml
diff options
context:
space:
mode:
authorLeslie Linden <none@none>2011-06-08 13:41:40 -0700
committerLeslie Linden <none@none>2011-06-08 13:41:40 -0700
commitde78d17e912b7e2a4c563a7a428f11cce33644c0 (patch)
tree6c415389f180f6a5d879b050670fd6cd3d987229 /indra/newview/skins/default/colors.xml
parent888b39c283e53fd128778e70e231bcb6053de4b8 (diff)
parent1361eeae4e4538c175a32d48246897c4659cc26c (diff)
Merge from viewer-experience
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rw-r--r--indra/newview/skins/default/colors.xml11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index efd2559a55..dc810cbf7c 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -770,6 +770,17 @@
name="MenuBarProjectBgColor"
reference="MdBlue" />
+ <color
+ name="MeshImportTableNormalColor"
+ value="1 1 1 1"/>
+ <color
+ name="MeshImportTableHighlightColor"
+ value="0.2 0.8 1 1"/>
+
+ <color
+ name="DirectChatColor"
+ reference="LtOrange" />
+
<!-- Generic color names (legacy) -->
<color
name="white"