diff options
| author | Melanie | 2011-10-11 22:52:15 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-11 22:52:15 +0100 |
| commit | 1b2849319ce9149cc4f01a01b3efa6551b2b6e93 (patch) | |
| tree | 3ddbdbeecb0dd29594218cf72fa0c003014bc113 | |
| parent | Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge (diff) | |
| parent | Correct asset id of library default iris texture. (diff) | |
| download | opensim-SC_OLD-1b2849319ce9149cc4f01a01b3efa6551b2b6e93.zip opensim-SC_OLD-1b2849319ce9149cc4f01a01b3efa6551b2b6e93.tar.gz opensim-SC_OLD-1b2849319ce9149cc4f01a01b3efa6551b2b6e93.tar.bz2 opensim-SC_OLD-1b2849319ce9149cc4f01a01b3efa6551b2b6e93.tar.xz | |
Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge
| -rw-r--r-- | bin/inventory/TexturesLibrary/TexturesLibraryItems.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml index e1452f6..9b5080d 100644 --- a/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml +++ b/bin/inventory/TexturesLibrary/TexturesLibraryItems.xml | |||
| @@ -564,7 +564,7 @@ | |||
| 564 | 564 | ||
| 565 | <Section Name="Default Iris Texture"> | 565 | <Section Name="Default Iris Texture"> |
| 566 | <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000013"/> | 566 | <Key Name="inventoryID" Value="00000000-0000-2222-9999-000000000013"/> |
| 567 | <Key Name="assetID" Value="6e610cae-3b0d-4729-b482-2c31ab2e49f9"/> | 567 | <Key Name="assetID" Value="6522e74d-1660-4e7f-b601-6f48c1659a77"/> |
| 568 | <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/> | 568 | <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba001"/> |
| 569 | <Key Name="description" Value=""/> | 569 | <Key Name="description" Value=""/> |
| 570 | <Key Name="name" Value="Default Iris Texture" /> | 570 | <Key Name="name" Value="Default Iris Texture" /> |