diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-26 13:08:13 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-26 13:08:13 -0400 |
| commit | 1ead58914837f12e943ff1db4b71cd3ed379d01c (patch) | |
| tree | dbb6678b4b519e543deb3c344174888b99b4ccd7 /indra/newview/skins/default/colors.xml | |
| parent | 5b7b3cbbbbec439880a33af8944d10c7bb527c3a (diff) | |
| parent | d475a96e94be90e68cf34bf6c25d8ab259aa47b5 (diff) | |
Merge
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 |