aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs17
-rw-r--r--OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs1
2 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index f5b9f2e..46aba68 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -192,7 +192,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
192 m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); 192 m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids);
193 } 193 }
194 194
195 protected void SaveInvDir(InventoryFolderImpl inventoryFolder, string path) 195 /// <summary>
196 /// Save an inventory folder
197 /// </summary>
198 /// <param name="inventoryFolder">The inventory folder to save</param>
199 /// <param name="path">The path to which the folder should be saved</param>
200 protected void SaveInvFolder(InventoryFolderImpl inventoryFolder, string path)
196 { 201 {
197 path += 202 path +=
198 string.Format( 203 string.Format(
@@ -200,6 +205,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
200 inventoryFolder.Name, 205 inventoryFolder.Name,
201 ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, 206 ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
202 inventoryFolder.ID); 207 inventoryFolder.ID);
208
209 // We need to make sure that we record empty folders
203 m_archive.WriteDir(path); 210 m_archive.WriteDir(path);
204 211
205 List<InventoryFolderImpl> childFolders = inventoryFolder.RequestListOfFolderImpls(); 212 List<InventoryFolderImpl> childFolders = inventoryFolder.RequestListOfFolderImpls();
@@ -228,7 +235,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
228 235
229 foreach (InventoryFolderImpl childFolder in childFolders) 236 foreach (InventoryFolderImpl childFolder in childFolders)
230 { 237 {
231 SaveInvDir(childFolder, path); 238 SaveInvFolder(childFolder, path);
232 } 239 }
233 240
234 foreach (InventoryItemBase item in items) 241 foreach (InventoryItemBase item in items)
@@ -314,8 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
314 "[INVENTORY ARCHIVER]: Found item {0} {1} at {2}", 321 "[INVENTORY ARCHIVER]: Found item {0} {1} at {2}",
315 inventoryItem.Name, inventoryItem.ID, m_invPath); 322 inventoryItem.Name, inventoryItem.ID, m_invPath);
316 323
317 //get and export item info 324 SaveInvItem(inventoryItem, ArchiveConstants.INVENTORY_PATH);
318 SaveInvItem(inventoryItem, ArchiveConstants.INVENTORY_PATH + m_invPath);
319 } 325 }
320 } 326 }
321 else 327 else
@@ -325,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
325 inventoryFolder.Name, inventoryFolder.ID, m_invPath); 331 inventoryFolder.Name, inventoryFolder.ID, m_invPath);
326 332
327 //recurse through all dirs getting dirs and files 333 //recurse through all dirs getting dirs and files
328 SaveInvDir(inventoryFolder, ArchiveConstants.INVENTORY_PATH); 334 SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH);
329 } 335 }
330 336
331 SaveUsers(); 337 SaveUsers();
@@ -334,7 +340,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
334 340
335 /// <summary> 341 /// <summary>
336 /// Save information for the users that we've collected. 342 /// Save information for the users that we've collected.
337 /// XXX: Doesn't actually do this yet.
338 /// </summary> 343 /// </summary>
339 protected void SaveUsers() 344 protected void SaveUsers()
340 { 345 {
diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
index fe6b0e7..d62ce1f 100644
--- a/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
+++ b/OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
@@ -38,7 +38,6 @@ using OpenSim.Region.Framework.Scenes;
38using OpenSim.Tests.Common.Mock; 38using OpenSim.Tests.Common.Mock;
39using OpenSim.Tests.Common.Setup; 39using OpenSim.Tests.Common.Setup;
40using log4net; 40using log4net;
41using System.Reflection;
42 41
43namespace OpenSim.Region.Framework.Scenes.Tests 42namespace OpenSim.Region.Framework.Scenes.Tests
44{ 43{