diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2021-06-29 10:48:02 -0400 |
commit | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (patch) | |
tree | 60dd4f9462ba11a4cb7503c64fa1dd2a23373a67 /indra/newview/skins/default/colors.xml | |
parent | 1eeb4c85a120b23b853aabb8e6cf984b03dbc17f (diff) | |
parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) |
DRTVWR-538: Merge branch 'master' into c++17
Diffstat (limited to 'indra/newview/skins/default/colors.xml')
-rw-r--r-- | indra/newview/skins/default/colors.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index efe8102f83..7beb013fba 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -854,6 +854,9 @@ name="ColorSwatchBorderColor" value="0.45098 0.517647 0.607843 1"/> <color + name="ChatTeleportSeparatorColor" + reference="Black" /> + <color name="ChatTimestampColor" reference="White" /> <color @@ -963,4 +966,7 @@ <color name="OutfitGalleryItemUnselected" value="0.4 0.4 0.4 1" /> + <color + name="AddPaymentPanel" + value="0.27 0.27 0.27 1" /> </colors> |