Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge

author: Melanie 2011-10-11 21:45:01 +0100
committer: Melanie 2011-10-11 21:45:01 +0100
commit: 117d24be54f812a138d49a1470f2e2cc6f7c2f56 (patch)
tree: f6ad9470b0e41d058bba904121cbfcfeb027a30f /bin
parent: Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmerge (diff)
parent: Fix base_hair.dat to actually contain the base hair asset rather than base ey... (diff)
download: opensim-SC-117d24be54f812a138d49a1470f2e2cc6f7c2f56.zip
opensim-SC-117d24be54f812a138d49a1470f2e2cc6f7c2f56.tar.gz
opensim-SC-117d24be54f812a138d49a1470f2e2cc6f7c2f56.tar.bz2
opensim-SC-117d24be54f812a138d49a1470f2e2cc6f7c2f56.tar.xz
1 files changed, 94 insertions, 6 deletions
diff --git a/bin/assets/BodyPartsAssetSet/base_hair.dat b/bin/assets/BodyPartsAssetSet/base_hair.dat
index 520157c..05e21d8 100644
--- a/bin/assets/BodyPartsAssetSet/base_hair.dat
+++ b/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
+type 2
-parameters 2
+parameters 90
-98 0
+16 0
-99 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
author	Melanie	2011-10-11 21:45:01 +0100
committer	Melanie	2011-10-11 21:45:01 +0100
commit	117d24be54f812a138d49a1470f2e2cc6f7c2f56 (patch)
tree	f6ad9470b0e41d058bba904121cbfcfeb027a30f /bin
parent	Merge commit 'c695e23dd9474e31b031e4d1f57b23aba386145a' into bigmerge (diff)
parent	Fix base_hair.dat to actually contain the base hair asset rather than base ey... (diff)
download	opensim-SC-117d24be54f812a138d49a1470f2e2cc6f7c2f56.zip opensim-SC-117d24be54f812a138d49a1470f2e2cc6f7c2f56.tar.gz opensim-SC-117d24be54f812a138d49a1470f2e2cc6f7c2f56.tar.bz2 opensim-SC-117d24be54f812a138d49a1470f2e2cc6f7c2f56.tar.xz

diff --git a/bin/assets/BodyPartsAssetSet/base_hair.dat b/bin/assets/BodyPartsAssetSet/base_hair.dat index 520157c..05e21d8 100644 --- a/bin/assets/BodyPartsAssetSet/base_hair.dat +++ b/bin/assets/BodyPartsAssetSet/base_hair.dat
@@ -1,5 +1,5 @@
1	LLWearable version 22	1	LLWearable version 22
2	New Eyes	2	New Hair
3		3
4	permissions 0	4	permissions 0
5	{	5	{
@@ -18,9 +18,97 @@ New Eyes
18	sale_type not	18	sale_type not
19	sale_price 10	19	sale_price 10
20	}	20	}
21	type 3	21	type 2
22	parameters 2	22	parameters 90
23	98 0	23	16 0
24	99 0	24	31 .5
		25	112 0
		26	113 0
		27	114 .5
		28	115 0
		29	119 .5
		30	130 .45
		31	131 .5
		32	132 .39
		33	133 .25
		34	134 .5
		35	135 .55
		36	136 .5
		37	137 .5
		38	140 0
		39	141 0
		40	142 0
		41	143 .12
		42	144 .1
		43	145 0
		44	146 0
		45	147 0
		46	148 .22
		47	149 0
		48	166 0
		49	167 0
		50	168 0
		51	169 0
		52	171 0
		53	172 .5
		54	173 0
		55	174 0
		56	175 .3
		57	176 0
		58	177 0
		59	178 0
		60	179 0
		61	180 .13
		62	181 .14
		63	182 .7
		64	183 .05
		65	184 0
		66	190 0
		67	191 0
		68	192 0
		69	400 .75
		70	640 0
		71	641 0
		72	642 0
		73	643 0
		74	644 0
		75	645 0
		76	674 -.3
		77	750 .7
		78	751 0
		79	752 .5
		80	754 0
		81	755 .05
		82	757 -1
		83	761 0
		84	762 0
		85	763 .55
		86	771 0
		87	774 0
		88	782 0
		89	783 0
		90	784 0
		91	785 0
		92	786 0
		93	787 0
		94	788 0
		95	789 0
		96	790 0
		97	870 -.29
		98	871 0
		99	872 .25
		100	1000 .5
		101	1001 .5
		102	1002 .7
		103	1003 .7
		104	1004 0
		105	1005 0
		106	1006 0
		107	1007 0
		108	1008 0
		109	1009 0
		110	1010 0
		111	1011 0
		112	1012 .25
25	textures 1	113	textures 1
26	3 6522e74d-1660-4e7f-b601-6f48c1659a77	114	4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b