diff options
author | Oz Linden <oz@lindenlab.com> | 2013-12-16 13:27:13 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-12-16 13:27:13 -0500 |
commit | 36281d53ff5b5eb9a67a3ce01c077fe8aa6cc841 (patch) | |
tree | 28a327f6da80b1c4b22ab658eb466734c408349c /indra/newview/skins/default | |
parent | 97d9eee4ffc56123656abfe46db140bd1acca685 (diff) | |
parent | 44ea72848fd64201ceef344e4136b9323c258615 (diff) |
merge changes for storm-1981
Diffstat (limited to 'indra/newview/skins/default')
-rwxr-xr-x | indra/newview/skins/default/colors.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index f53995732f..6f1a24d7f8 100755 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -511,6 +511,9 @@ name="MapTrackColor" reference="Red" /> <color + name="MapTrackColorUnder" + reference="Blue" /> + <color name="MapTrackDisabledColor" value="0.5 0 0 1" /> <color |