diff options
| author | Justin Clark-Casey (justincc) | 2011-09-23 22:36:20 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-09-23 22:36:20 +0100 |
| commit | 8c4dd6b3302a142c6ac7578cc5012049c51610ed (patch) | |
| tree | 75540bc841ed9588479c64d2cffd116130afd928 /bin/inventory/TexturesLibrary | |
| parent | Use a copy of the inventory items list to register users in the thread starte... (diff) | |
| parent | remove unused SOP.Create() method (diff) | |
| download | opensim-SC_OLD-8c4dd6b3302a142c6ac7578cc5012049c51610ed.zip opensim-SC_OLD-8c4dd6b3302a142c6ac7578cc5012049c51610ed.tar.gz opensim-SC_OLD-8c4dd6b3302a142c6ac7578cc5012049c51610ed.tar.bz2 opensim-SC_OLD-8c4dd6b3302a142c6ac7578cc5012049c51610ed.tar.xz | |
Merge branch 'master' into 0.7.2-post-fixes
Diffstat (limited to 'bin/inventory/TexturesLibrary')
| -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> |