diff options
| author | Jonathan Freedman | 2010-10-29 23:58:14 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:58:14 -0400 |
| commit | c8d65c359ffcccf2e0fb61fcc31c45072f14b773 (patch) | |
| tree | 0d5e0fe48ababacd820479f95b3ab2239ec2c84d /bin | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Rename the new default texture to be consistent with the others (diff) | |
| download | opensim-SC_OLD-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.zip opensim-SC_OLD-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.gz opensim-SC_OLD-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.bz2 opensim-SC_OLD-c8d65c359ffcccf2e0fb61fcc31c45072f14b773.tar.xz | |
Merge branch 'master' into mantis5110
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/assets/TexturesAssetSet/TexturesAssetSet.xml | 6 | ||||
| -rw-r--r-- | bin/assets/TexturesAssetSet/default_alpha.jp2 | bin | 0 -> 319 bytes | |||
| -rw-r--r-- | bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml | 28 |
3 files changed, 34 insertions, 0 deletions
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml index c5cafa7..5484ee2 100644 --- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml +++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml | |||
| @@ -1,4 +1,10 @@ | |||
| 1 | <Nini> | 1 | <Nini> |
| 2 | <Section Name="Default Alpha"> | ||
| 3 | <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" /> | ||
| 4 | <Key Name="name" Value="alpha" /> | ||
| 5 | <Key Name="assetType" Value="0" /> | ||
| 6 | <Key Name="fileName" Value="default_alpha.jp2" /> | ||
| 7 | </Section> | ||
| 2 | <Section Name="texture1"> | 8 | <Section Name="texture1"> |
| 3 | <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> | 9 | <Key Name="assetID" Value="00000000-0000-2222-3333-000000000099" /> |
| 4 | <Key Name="name" Value="femface" /> | 10 | <Key Name="name" Value="femface" /> |
diff --git a/bin/assets/TexturesAssetSet/default_alpha.jp2 b/bin/assets/TexturesAssetSet/default_alpha.jp2 new file mode 100644 index 0000000..af73c1e --- /dev/null +++ b/bin/assets/TexturesAssetSet/default_alpha.jp2 | |||
| Binary files differ | |||
diff --git a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml index aa8d9d9..5cb71c0 100644 --- a/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml +++ b/bin/inventory/BodyPartsLibrary/BodyPartsLibraryItems.xml | |||
| @@ -16,6 +16,34 @@ | |||
| 16 | </Section> | 16 | </Section> |
| 17 | --> | 17 | --> |
| 18 | <!-- | 18 | <!-- |
| 19 | <Section Name="Tattoo"> | ||
| 20 | <Key Name="inventoryID" Value="c47e22bd-3021-4ba4-82aa-2b5cb34d35e1" /> | ||
| 21 | <Key Name="assetID" Value="00000000-0000-2222-3333-100000001007" /> | ||
| 22 | <Key Name="folderID" Value="d499e5e0-b9bf-11dc-95ff-0800200c9a66"/> | ||
| 23 | <Key Name="description" Value="Tattoo" /> | ||
| 24 | <Key Name="name" Value="Tattoo" /> | ||
| 25 | <Key Name="assetType" Value="13" /> | ||
| 26 | <Key Name="inventoryType" Value="18" /> | ||
| 27 | <Key Name="currentPermissions" Value="2147483647" /> | ||
| 28 | <Key Name="nextPermissions" Value="2147483647" /> | ||
| 29 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
| 30 | <Key Name="basePermissions" Value="2147483647" /> | ||
| 31 | </Section> | ||
| 32 | |||
| 33 | <Section Name="Alpha"> | ||
| 34 | <Key Name="inventoryID" Value="bfb9923c-4838-4d2d-bf07-608c5b1165c8" /> | ||
| 35 | <Key Name="assetID" Value="1578a2b1-5179-4b53-b618-fe00ca5a5594" /> | ||
| 36 | <Key Name="folderID" Value="d499e5e0-b9bf-11dc-95ff-0800200c9a66"/> | ||
| 37 | <Key Name="description" Value="Hair" /> | ||
| 38 | <Key Name="name" Value="Hair" /> | ||
| 39 | <Key Name="assetType" Value="13" /> | ||
| 40 | <Key Name="inventoryType" Value="18" /> | ||
| 41 | <Key Name="currentPermissions" Value="2147483647" /> | ||
| 42 | <Key Name="nextPermissions" Value="2147483647" /> | ||
| 43 | <Key Name="everyonePermissions" Value="2147483647" /> | ||
| 44 | <Key Name="basePermissions" Value="2147483647" /> | ||
| 45 | </Section> | ||
| 46 | |||
| 19 | <Section Name="Hair"> | 47 | <Section Name="Hair"> |
| 20 | <Key Name="inventoryID" Value="d342e6c1-b9d2-11dc-95ff-0800200c9a66" /> | 48 | <Key Name="inventoryID" Value="d342e6c1-b9d2-11dc-95ff-0800200c9a66" /> |
| 21 | <Key Name="assetID" Value="d342e6c0-b9d2-11dc-95ff-0800200c9a66" /> | 49 | <Key Name="assetID" Value="d342e6c0-b9d2-11dc-95ff-0800200c9a66" /> |