diff options
author | Leslie Linden <leslie@lindenlab.com> | 2011-10-05 16:39:32 -0700 |
---|---|---|
committer | Leslie Linden <leslie@lindenlab.com> | 2011-10-05 16:39:32 -0700 |
commit | d8489166645f2e3ea7edd252997f9f48aa0871c3 (patch) | |
tree | e2f5c52f0c397b0dfb1d0e3cb47ca59d609292dc /indra/newview/skins/default/colors.xml | |
parent | 17c699e4281ffff58e24c5db960a5c33018f1747 (diff) | |
parent | a88bb3231b2685eb640710d7617d26b7f3a2c0d2 (diff) |
Merge with latest
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 d19e56e9a0..b5cc949ebf 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -90,6 +90,9 @@ name="LtYellow" value="1 1 .79 1" /> <color + name="DrYellow" + value="1 0.86 0 1" /> + <color name="LtOrange" value="1 .85 .73 1" /> <color @@ -517,6 +520,9 @@ name="MenuPopupBgColor" reference="DkGray2" /> <color + name="ModelUploaderLabels" + value="1 0.6 0 1" /> + <color name="MultiSliderDisabledThumbColor" reference="Black" /> <color |