aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-11 16:51:57 +0100
committerJustin Clark-Casey (justincc)2009-09-11 16:51:57 +0100
commit212efc0c764210a8f0f2936b7802ecc04dbd5fd6 (patch)
tree5c5e82a1bbc61ae6edd84343c103f53f64a95b71 /OpenSim/Region/CoreModules/Avatar
parentminor: correct my name in one of the library bundled scripts (diff)
downloadopensim-SC_OLD-212efc0c764210a8f0f2936b7802ecc04dbd5fd6.zip
opensim-SC_OLD-212efc0c764210a8f0f2936b7802ecc04dbd5fd6.tar.gz
opensim-SC_OLD-212efc0c764210a8f0f2936b7802ecc04dbd5fd6.tar.bz2
opensim-SC_OLD-212efc0c764210a8f0f2936b7802ecc04dbd5fd6.tar.xz
Remove bug where iar created folders could not be deleted after relog
New folders need to be created with AssetType.Unknown rather than AssetType.Folder!
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs8
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs2
2 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 0441215..907e2d4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -290,11 +290,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
290 290
291 string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex); 291 string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
292 UUID newFolderId = UUID.Random(); 292 UUID newFolderId = UUID.Random();
293 293
294 // Asset type has to be Unknown here rather than Folder, otherwise the created folder can't be
295 // deleted once the client has relogged.
296 // The root folder appears to be labelled AssetType.Folder (shows up as "Category" in the client)
297 // even though there is a AssetType.RootCategory
294 destFolder 298 destFolder
295 = new InventoryFolderBase( 299 = new InventoryFolderBase(
296 newFolderId, newFolderName, m_userInfo.UserProfile.ID, 300 newFolderId, newFolderName, m_userInfo.UserProfile.ID,
297 (short)AssetType.Folder, destFolder.ID, 1); 301 (short)AssetType.Unknown, destFolder.ID, 1);
298 m_scene.InventoryService.AddFolder(destFolder); 302 m_scene.InventoryService.AddFolder(destFolder);
299 303
300// UUID newFolderId = UUID.Random(); 304// UUID newFolderId = UUID.Random();
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index b178772..7b4a9eb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -410,4 +410,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
410 id); 410 id);
411 } 411 }
412 } 412 }
413} 413} \ No newline at end of file