Merge branch 'master' of ssh://MyConnection/var/git/opensim

bin/assets/AssetSets.xml

@@ -1,12 +1,4 @@
 <Nini>
-  <!-- You probably don't want to remove the OpenSim asset set
-       since it contains various default assets which are currently hardcoded 
-       However, you can remove the corresponding inventory library in bin/inventory if you wish
-  -->
-
-  <Section Name="OpenSim Asset Set">
-    <Key Name="file" Value="OpenSimAssetSet/OpenSimAssetSet.xml"/>
-  </Section>
 
   <!-- New asset sets can be added as shown below -->
 

bin/assets/OpenSimAssetSet/OpenSimAssetSet.xml

@@ -1,54 +0,0 @@
-<Nini>
-  <!--
-  <Section Name="Skin">
-    <Key Name="assetID" Value="77c41e39-38f9-f75a-024e-585989bbabbb"/>
-    <Key Name="name" Value="Skin"/>
-    <Key Name="assetType" Value="13" />
-    <Key Name="fileName" Value="base_skin.dat"/>
-  </Section>
-  <Section Name="Skin">
-    <Key Name="assetID" Value="77c41e39-38f9-f75a-024e-585989bbabbc"/>
-    <Key Name="name" Value="Jim Skin"/>
-    <Key Name="assetType" Value="13" />
-    <Key Name="fileName" Value="jim_skin.dat"/>
-  </Section>
-  <Section Name="Skin">
-    <Key Name="assetID" Value="77c41e39-38f9-f75a-024e-585989bbabbd"/>
-    <Key Name="name" Value="Goblin Skin"/>
-    <Key Name="assetType" Value="13" />
-    <Key Name="fileName" Value="goblin_skin.dat"/>
-  </Section>
-  <Section Name="Shape">
-    <Key Name="assetID" Value="66c41e39-38f9-f75a-024e-585989bfab73"/>
-    <Key Name="name" Value="Shape"/>
-    <Key Name="assetType" Value="13" />
-    <Key Name="fileName" Value="base_shape.dat"/>
-  </Section>
-  <Section Name="Shape">
-    <Key Name="assetID" Value="66c41e39-38f9-f75a-024e-585989bfab74"/>
-    <Key Name="name" Value="Jim Shape"/>
-    <Key Name="assetType" Value="13" />
-    <Key Name="fileName" Value="jim_shape.dat"/>
-  </Section>
-  <Section Name="Shape">
-    <Key Name="assetID" Value="66c41e39-38f9-f75a-024e-585989bfab75"/>
-    <Key Name="name" Value="Little Goblin Shape"/>
-    <Key Name="assetType" Value="13" />
-    <Key Name="fileName" Value="little_goblin_shape.dat"/>
-  </Section>
- -->
-  <!--
-  <Section Name="Shirt">
-    <Key Name="assetID" Value="00000000-38f9-1111-024e-222222111110"/>
-    <Key Name="name" Value="Shirt"/>
-    <Key Name="assetType" Value="5" />
-    <Key Name="fileName" Value="newshirt.dat"/>
-  </Section>
-  <Section Name="Pants">
-    <Key Name="assetID" Value="00000000-38f9-1111-024e-222222111120"/>
-    <Key Name="name" Value="Pants"/>
-    <Key Name="assetType" Value="5" />
-    <Key Name="fileName" Value="newpants.dat"/>
-  </Section>
-  -->
-</Nini>

bin/assets/OpenSimAssetSet/base_shape.dat

@@ -1,105 +0,0 @@
-LLWearable version 22
-Female Shape and Outfit 3 Shape
-Created by system from avatar's appearance.
-	permissions 0
-	{
-		base_mask	00000000
-		owner_mask	00000000
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00000000
-		creator_id	11111111-1111-0000-0000-000100bba000
-		owner_id	11111111-1111-0000-0000-000100bba000
-		last_owner_id	11111111-1111-0000-0000-000100bba000
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	0
-	}
-type 0
-parameters 82
-1 .21
-2 -.5
-4 -.11
-5 -.1
-6 -.3
-7 -.4
-8 -.5
-10 .7
-11 .34
-12 -.5
-13 0
-14 .04
-15 .58
-17 .56
-18 -.26
-19 -.73
-20 -.34
-21 -.01
-22 1
-23 -.5
-24 -.63
-25 .44
-27 .05
-33 -.24
-34 -.7
-35 -.16
-36 -.2
-37 -.98
-38 -.5
-80 0
-105 .07
-155 -.22
-157 0
-185 -1
-193 .86
-196 -.74
-505 .65
-506 .12
-507 -1.5
-515 0
-517 .16
-518 .8
-629 0
-637 0
-646 .4
-647 1
-649 .36
-650 .85
-652 .49
-653 -1
-656 0
-659 .65
-662 .5
-663 0
-664 0
-665 0
-675 -.15
-676 .26
-678 .28
-682 .27
-683 -.19
-684 -.09
-685 0
-690 .45
-692 .4
-693 -0
-753 -.5
-756 -.08
-758 .24
-759 .6
-760 .11
-764 -.38
-765 -.3
-769 .42
-773 .51
-795 .16
-796 .11
-799 .36
-841 0
-842 -.82
-879 0
-880 0
-textures 0

bin/assets/OpenSimAssetSet/base_skin.dat

@@ -1,52 +0,0 @@
-LLWearable version 22
-Sexy - Female Skin
-
-	permissions 0
-	{
-		base_mask	00000000
-		owner_mask	00000000
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00000000
-		creator_id	11111111-1111-0000-0000-000100bba000
-		owner_id	11111111-1111-0000-0000-000100bba000
-		last_owner_id	11111111-1111-0000-0000-000100bba000
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	10
-	}
-type 1
-parameters 26
-108 0
-110 0
-111 0
-116 0
-117 1
-150 0
-162 0
-163 0
-165 0
-700 .01
-701 .5
-702 .26
-703 0
-704 0
-705 .5
-706 .6
-707 0
-708 0
-709 0
-710 0
-711 .5
-712 0
-713 .7
-714 0
-715 0
-775 0
-textures 3
-0 00000000-0000-1111-9999-000000000012
-5 00000000-0000-1111-9999-000000000010
-6 00000000-0000-1111-9999-000000000011

bin/assets/OpenSimAssetSet/goblin_skin.dat

@@ -1,49 +0,0 @@
-LLWearable version 22
-Goblin Skin
-
-	permissions 0
-	{
-		base_mask	00080000
-		owner_mask	00080000
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00080000
-		creator_id	15787b54-7833-4238-9c18-80ddd7687bfe
-		owner_id	15787b54-7833-4238-9c18-80ddd7687bfe
-		last_owner_id	15787b54-7833-4238-9c18-80ddd7687bfe
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	10
-	}
-type 1
-parameters 26
-108 .6
-110 .1
-111 1
-116 .68
-117 .28
-150 0
-162 1
-163 .99
-165 .69
-700 .51
-701 .2
-702 0
-703 0
-704 0
-705 .5
-706 .6
-707 0
-708 0
-709 0
-710 0
-711 .5
-712 0
-713 .7
-714 0
-715 0
-775 0
-textures 0

bin/assets/OpenSimAssetSet/jim_shape.dat

@@ -1,105 +0,0 @@
-LLWearable version 22
-Jim Shape
-
-	permissions 0
-	{
-		base_mask	00000000
-		owner_mask	00000000
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00000000
-		creator_id	11111111-1111-0000-0000-000100bba000
-		owner_id	11111111-1111-0000-0000-000100bba000
-		last_owner_id	11111111-1111-0000-0000-000100bba000
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	10
-	}
-type 0
-parameters 82
-1 0
-2 0
-4 0
-5 0
-6 0
-7 0
-8 0
-10 0
-11 0
-12 0
-13 0
-14 0
-15 0
-17 0
-18 0
-19 0
-20 0
-21 0
-22 0
-23 0
-24 0
-25 0
-27 0
-33 -2.3
-34 0
-35 0
-36 -.5
-37 -1.34
-38 0
-80 1
-105 .5
-155 0
-157 0
-185 0
-193 .5
-196 0
-505 .5
-506 0
-507 0
-515 0
-517 0
-518 0
-629 .5
-637 0
-646 0
-647 0
-649 .5
-650 0
-652 .29
-653 0
-656 0
-659 .5
-662 .5
-663 0
-664 0
-665 0
-675 0
-676 0
-678 .5
-682 .5
-683 -.15
-684 0
-685 0
-690 .5
-692 1
-693 .6
-753 0
-756 0
-758 0
-759 .5
-760 0
-764 0
-765 0
-769 .5
-773 .5
-795 .84
-796 0
-799 .5
-841 0
-842 0
-879 0
-880 0
-textures 0

bin/assets/OpenSimAssetSet/jim_skin.dat

@@ -1,50 +0,0 @@
-LLWearable version 22
-Jim skin
-
-	permissions 0
-	{
-		base_mask	00000000
-		owner_mask	00000000
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00000000
-		creator_id	11111111-1111-0000-0000-000100bba000
-		owner_id	11111111-1111-0000-0000-000100bba000
-		last_owner_id	11111111-1111-0000-0000-000100bba000
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	10
-	}
-type 1
-parameters 26
-108 0
-110 0
-111 .5
-116 0
-117 0
-150 0
-162 0
-163 0
-165 0
-700 .25
-701 0
-702 0
-703 0
-704 0
-705 .5
-706 .6
-707 0
-708 0
-709 0
-710 0
-711 .5
-712 0
-713 .7
-714 0
-715 0
-775 0
-textures 0
-

bin/assets/OpenSimAssetSet/licenses.txt

@@ -1,37 +0,0 @@
-These textures have been collected from various sources:
-
-1. Blender Texture Disk
-
-Notice of rights
-
-This is the collection of textures and materials of the "Blender Texture Disk", a product created by the company "NaN Technologies" in 2001, and later sold in the blender.org e-shop to support Open Source Blender development.
-
-The Blender Foundation has now decided to open up this content entirely as public domain. We wish you a lot of fun with the collection!
-Ton Roosendaal
-Chairman Blender Foundation
-ton(at)blender(dot)org
-
-2. Hawaiian Plant Textures
-
-http://www.vterrain.org/Hawaii/Flora/textures/index.html
-
-I am placing these texture maps into the public domain; if you want higher resolutions or have any other questions or feedback, please contact me: info@vterrain.org
-
-3. Golgotha Textures
-
-Golgotha was a game under development by Crack Dot Com. When game development was abandoned, the authors generously donated their work to the public domain.
-
-
-4. Some made by me, Babblefrog
-
-A few of the wood textures were created by me using Wood Workshop. These I donate to the public domain.
-
-5. From the VTerrain project. 
-
-    The source code and data in this distribution are Copyright (c) 2001-2005 Virtual Terrain Project.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated data and documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

bin/assets/OpenSimAssetSet/little_goblin_shape.dat

@@ -1,105 +0,0 @@
-LLWearable version 22
-See the little goblin
-
-	permissions 0
-	{
-		base_mask	00000000
-		owner_mask	00000000
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00000000
-		creator_id	11111111-1111-0000-0000-000100bba000
-		owner_id	11111111-1111-0000-0000-000100bba000
-		last_owner_id	11111111-1111-0000-0000-000100bba000
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	10
-	}
-type 0
-parameters 82
-1 0
-2 0
-4 0
-5 0
-6 0
-7 0
-8 0
-10 0
-11 0
-12 0
-13 0
-14 0
-15 1.5
-17 0
-18 0
-19 0
-20 0
-21 0
-22 0
-23 0
-24 2
-25 0
-27 0
-33 -2.3
-34 -.7
-35 2
-36 1.4
-37 .16
-38 -1
-80 1
-105 .5
-155 0
-157 .68
-185 0
-193 0
-196 0
-505 .5
-506 0
-507 0
-515 3
-517 .52
-518 0
-629 .5
-637 0
-646 -.4
-647 -.5
-649 .5
-650 0
-652 1
-653 0
-656 0
-659 .5
-662 .5
-663 0
-664 0
-665 0
-675 .3
-676 .95
-678 .74
-682 1
-683 .12
-684 0
-685 -.5
-690 .75
-692 -1
-693 -1
-753 2.34
-756 -1
-758 0
-759 .5
-760 0
-764 0
-765 0
-769 .5
-773 .5
-795 1
-796 3
-799 .5
-841 .66
-842 0
-879 -.5
-880 0
-textures 0

bin/assets/OpenSimAssetSet/newhair.dat

@@ -1,63 +0,0 @@
-LLWearable version 22
-New Hair
-
-	permissions 0
-	{
-		base_mask	7fffffff
-		owner_mask	7fffffff
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00082000
-		creator_id	a52db6d0-e96c-4454-85e5-3523722daa25
-		owner_id	a52db6d0-e96c-4454-85e5-3523722daa25
-		last_owner_id	00000000-0000-0000-0000-000000000000
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	10
-	}
-type 2
-parameters 39
-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 .13
-166 0
-167 0
-168 0
-169 0
-177 0
-181 .14
-182 .7
-183 .05
-184 0
-192 0
-674 -.3
-750 .7
-752 .5
-754 0
-755 .05
-757 -1
-762 0
-763 .55
-785 0
-789 0
-textures 1
-4 7ca39b4c-bd19-4699-aff7-f93fd03d3e7b

bin/assets/OpenSimAssetSet/newpants.dat

@@ -1,33 +0,0 @@
-LLWearable version 22
-New Pants
-
-	permissions 0
-	{
-		base_mask	00000000
-		owner_mask	00000000
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00000000
-		creator_id	11111111-1111-0000-0000-000100bba000
-		owner_id	11111111-1111-0000-0000-000100bba000
-		last_owner_id	00000000-0000-0000-0000-000000000000
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	10
-	}
-type 5
-parameters 9
-625 0
-638 0
-806 .8
-807 .2
-808 .2
-814 1
-815 .8
-816 0
-869 0
-textures 1
-2 5748decc-f629-461c-9a36-a35a221fe21f

bin/assets/OpenSimAssetSet/newshirt.dat

@@ -1,34 +0,0 @@
-LLWearable version 22
-New Shirt
-
-	permissions 0
-	{
-		base_mask	00000000
-		owner_mask	00000000
-		group_mask	00000000
-		everyone_mask	00000000
-		next_owner_mask	00000000
-		creator_id	11111111-1111-0000-0000-000100bba000
-		owner_id	11111111-1111-0000-0000-000100bba000
-		last_owner_id	00000000-0000-0000-0000-000000000000
-		group_id	00000000-0000-0000-0000-000000000000
-	}
-	sale_info	0
-	{
-		sale_type	not
-		sale_price	10
-	}
-type 4
-parameters 10
-781 .78
-800 .65
-801 .82
-802 .78
-803 .5
-804 .5
-805 .6
-828 0
-840 0
-868 0
-textures 1
-1 5748decc-f629-461c-9a36-a35a221fe21f

bin/assets/OpenSimAssetSet/welcomeNote.dat

@@ -1,9 +0,0 @@
-Linden text version 2
-{
-LLEmbeddedItems version 1
-{
-count 0
-}
-Text length 95
-Hello and thank you for using OpenSim. For more infomation visit http://opensimulator.org/wiki/Main_Page}
-