aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
diff options
context:
space:
mode:
authorJeff Ames2009-11-23 11:26:06 +0900
committerJeff Ames2009-11-23 11:26:06 +0900
commit9f5c2acd128828d220bf7e47bd4fe13d7a2a910b (patch)
treebb1a273746c4b2a466dd705537a2457f0474faa2 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
parent* Added missing lock to m_forcelist when AddForce is called. When a user dr... (diff)
downloadopensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.zip
opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.gz
opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.bz2
opensim-SC_OLD-9f5c2acd128828d220bf7e47bd4fe13d7a2a910b.tar.xz
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index aafcfa2..9e76d79 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
136 successfulAssetRestores); 136 successfulAssetRestores);
137 } 137 }
138 else if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH)) 138 else if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH))
139 { 139 {
140 InventoryFolderBase foundFolder 140 InventoryFolderBase foundFolder
141 = ReplicateArchivePathToUserInventory( 141 = ReplicateArchivePathToUserInventory(
142 filePath, TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType, 142 filePath, TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType,
@@ -254,7 +254,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
254 254
255 string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex); 255 string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
256 256
257 newFolderName = InventoryArchiveUtils.UnescapeArchivePath(newFolderName); 257 newFolderName = InventoryArchiveUtils.UnescapeArchivePath(newFolderName);
258 UUID newFolderId = UUID.Random(); 258 UUID newFolderId = UUID.Random();
259 259
260 // Asset type has to be Unknown here rather than Folder, otherwise the created folder can't be 260 // Asset type has to be Unknown here rather than Folder, otherwise the created folder can't be
@@ -352,7 +352,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
352 item.Folder = loadFolder.ID; 352 item.Folder = loadFolder.ID;
353 353
354 //m_userInfo.AddItem(item); 354 //m_userInfo.AddItem(item);
355 m_scene.InventoryService.AddItem(item); 355 m_scene.InventoryService.AddItem(item);
356 356
357 return item; 357 return item;
358 } 358 }