diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 2a1c82e..0441215 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
294 | destFolder | 294 | destFolder |
295 | = new InventoryFolderBase( | 295 | = new InventoryFolderBase( |
296 | newFolderId, newFolderName, m_userInfo.UserProfile.ID, | 296 | newFolderId, newFolderName, m_userInfo.UserProfile.ID, |
297 | (short)AssetType.Folder, destFolder.ID, 0); | 297 | (short)AssetType.Folder, destFolder.ID, 1); |
298 | m_scene.InventoryService.AddFolder(destFolder); | 298 | m_scene.InventoryService.AddFolder(destFolder); |
299 | 299 | ||
300 | // UUID newFolderId = UUID.Random(); | 300 | // UUID newFolderId = UUID.Random(); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index 9c5f8f3..cc16c47 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs | |||
@@ -219,8 +219,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
219 | UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); | 219 | UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); |
220 | 220 | ||
221 | string itemName = "b.lsl"; | 221 | string itemName = "b.lsl"; |
222 | string archiveItemName | 222 | string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); |
223 | = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); | ||
224 | 223 | ||
225 | MemoryStream archiveWriteStream = new MemoryStream(); | 224 | MemoryStream archiveWriteStream = new MemoryStream(); |
226 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 225 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |
@@ -313,8 +312,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
313 | //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888"); | 312 | //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888"); |
314 | 313 | ||
315 | string itemName = "b.lsl"; | 314 | string itemName = "b.lsl"; |
316 | string archiveItemName | 315 | string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); |
317 | = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); | ||
318 | 316 | ||
319 | MemoryStream archiveWriteStream = new MemoryStream(); | 317 | MemoryStream archiveWriteStream = new MemoryStream(); |
320 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 318 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |
@@ -381,8 +379,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
381 | string user2LastName = "Mitty"; | 379 | string user2LastName = "Mitty"; |
382 | 380 | ||
383 | string itemName = "b.lsl"; | 381 | string itemName = "b.lsl"; |
384 | string archiveItemName | 382 | string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); |
385 | = string.Format("{0}{1}{2}", itemName, "_", UUID.Random()); | ||
386 | 383 | ||
387 | MemoryStream archiveWriteStream = new MemoryStream(); | 384 | MemoryStream archiveWriteStream = new MemoryStream(); |
388 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); | 385 | TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); |