diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-03 18:28:51 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-06-03 18:28:51 +0300 |
| commit | 17d862fdf2529a5b64a9a6909fe9eda22ab1057b (patch) | |
| tree | cdbf1a83987152183e7a7a0e37a8aefb111607ce | |
| parent | 27fdb654927db4c4597f733381a7b6568cfbb94b (diff) | |
STORM-1253 WIP Fixed track colors in the day cycle editor.
- Selected key now visually differs from others.
- Disabled triangle becomes more transparent.
| -rw-r--r-- | indra/llui/llmultislider.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/colors.xml | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/llui/llmultislider.cpp b/indra/llui/llmultislider.cpp index f744e9db41..9052bc7d1d 100644 --- a/indra/llui/llmultislider.cpp +++ b/indra/llui/llmultislider.cpp @@ -511,7 +511,7 @@ void LLMultiSlider::draw() mIt->second.mTop + extra_triangle_height, mIt->second.mLeft + mIt->second.getWidth() / 2, mIt->second.mBottom - extra_triangle_height, - mTriangleColor.get(), TRUE); + mTriangleColor.get() % opacity, TRUE); } } else if (!thumb_imagep) diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 973df6998a..b0628dfe67 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -500,22 +500,22 @@ reference="DkGray2" /> <color name="MultiSliderDisabledThumbColor" - reference="Unused?" /> + reference="Black" /> <color name="MultiSliderThumbCenterColor" - reference="Unused?" /> + reference="White" /> <color name="MultiSliderThumbCenterSelectedColor" - reference="Unused?" /> + reference="Green" /> <color name="MultiSliderThumbOutlineColor" reference="Unused?" /> <color name="MultiSliderTrackColor" - reference="Unused?" /> + reference="LtGray" /> <color name="MultiSliderTriangleColor" - reference="Unused?" /> + reference="Yellow" /> <!-- <color name="NameTagBackground" |