Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge

bin/assets/BodyPartsAssetSet/base_hair.dat

@@ -1,5 +1,5 @@
 LLWearable version 22
-New Eyes
+New Hair
 
 	permissions 0
 	{
@@ -18,9 +18,97 @@ New Eyes
 		sale_type	not
 		sale_price	10
 	}
-type 3
-parameters 2
-98 0
-99 0
+type 2
+parameters 90
+16 0
+31 .5
+112 0
+113 0
+114 .5
+115 0
+119 .5
+130 .45
+131 .5
+132 .39
+133 .25
+134 .5
+135 .55
+136 .5
+137 .5
+140 0
+141 0
+142 0
+143 .12
+144 .1
+145 0
+146 0
+147 0
+148 .22
+149 0
+166 0
+167 0
+168 0
+169 0
+171 0
+172 .5
+173 0
+174 0
+175 .3
+176 0
+177 0
+178 0
+179 0
+180 .13
+181 .14
+182 .7
+183 .05
+184 0
+190 0
+191 0
+192 0
+400 .75
+640 0
+641 0
+642 0
+643 0
+644 0
+645 0
+674 -.3
+750 .7
+751 0
+752 .5
+754 0
+755 .05
+757 -1
+761 0
+762 0
+763 .55
+771 0
+774 0
+782 0
+783 0
+784 0
+785 0
+786 0
+787 0
+788 0
+789 0
+790 0
+870 -.29
+871 0
+872 .25
+1000 .5
+1001 .5
+1002 .7
+1003 .7
+1004 0
+1005 0
+1006 0
+1007 0
+1008 0
+1009 0
+1010 0
+1011 0
+1012 .25
 textures 1
-3 6522e74d-1660-4e7f-b601-6f48c1659a77
+4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b