diff options
author | Melanie | 2011-10-12 00:10:15 +0200 |
---|---|---|
committer | Melanie | 2011-10-12 00:10:15 +0200 |
commit | 1c2b5d99c9601a3d301f4bc0f53389cca831ee04 (patch) | |
tree | 97fa9c758f429d5dee64234e442f2c83cd1b9994 /bin/inventory | |
parent | Merge branch 'careminster-presence-refactor' into bigmerge (diff) | |
parent | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge (diff) | |
download | opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.zip opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.gz opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.bz2 opensim-SC-1c2b5d99c9601a3d301f4bc0f53389cca831ee04.tar.xz |
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
Diffstat (limited to 'bin/inventory')
-rw-r--r-- | bin/inventory/TexturesLibrary/TexturesLibraryItems.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml index a018a0d..9b5080d 100644 --- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml +++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml | |||
@@ -561,4 +561,14 @@ | |||
561 | <Key Name="assetType" Value="0" /> | 561 | <Key Name="assetType" Value="0" /> |
562 | <Key Name="inventoryType" Value="0" /> | 562 | <Key Name="inventoryType" Value="0" /> |
563 | </Section> | 563 | </Section> |
564 | |||
565 | <Section Name="Default Iris Texture"> | ||
566 | <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000013"/> | ||
567 | <Key Name="assetID" Value="6522e74d-1660-4e7f-b601-6f48c1659a77"/> | ||
568 | <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/> | ||
569 | <Key Name="description" Value=""/> | ||
570 | <Key Name="name" Value="Default Iris Texture" /> | ||
571 | <Key Name="assetType" Value="0" /> | ||
572 | <Key Name="inventoryType" Value="0" /> | ||
573 | </Section> | ||
564 | </Nini> | 574 | </Nini> |