OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fix single item iar saving 

* Not yet ready for use
0.6.5-rc1
Justin Clarke Casey 2009-03-27 18:53:11 +00:00
parent 37e81c7d54
commit 053a6b355c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
View File

@ -192,7 +192,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids);
} }
protected void SaveInvDir(InventoryFolderImpl inventoryFolder, string path) /// <summary>
/// Save an inventory folder
/// </summary>
/// <param name="inventoryFolder">The inventory folder to save</param>
/// <param name="path">The path to which the folder should be saved</param>
protected void SaveInvFolder(InventoryFolderImpl inventoryFolder, string path)
{ {
path += path +=
string.Format( string.Format(
@ -200,6 +205,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
inventoryFolder.Name, inventoryFolder.Name,
ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR,
inventoryFolder.ID); inventoryFolder.ID);
// We need to make sure that we record empty folders
m_archive.WriteDir(path); m_archive.WriteDir(path);
List<InventoryFolderImpl> childFolders = inventoryFolder.RequestListOfFolderImpls(); List<InventoryFolderImpl> childFolders = inventoryFolder.RequestListOfFolderImpls();
@ -228,7 +235,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
foreach (InventoryFolderImpl childFolder in childFolders) foreach (InventoryFolderImpl childFolder in childFolders)
{ {
SaveInvDir(childFolder, path); SaveInvFolder(childFolder, path);
} }
foreach (InventoryItemBase item in items) foreach (InventoryItemBase item in items)
@ -314,8 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
"[INVENTORY ARCHIVER]: Found item {0} {1} at {2}", "[INVENTORY ARCHIVER]: Found item {0} {1} at {2}",
inventoryItem.Name, inventoryItem.ID, m_invPath); inventoryItem.Name, inventoryItem.ID, m_invPath);
//get and export item info SaveInvItem(inventoryItem, ArchiveConstants.INVENTORY_PATH);
SaveInvItem(inventoryItem, ArchiveConstants.INVENTORY_PATH + m_invPath);
} }
} }
else else
@ -325,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
inventoryFolder.Name, inventoryFolder.ID, m_invPath); inventoryFolder.Name, inventoryFolder.ID, m_invPath);
//recurse through all dirs getting dirs and files //recurse through all dirs getting dirs and files
SaveInvDir(inventoryFolder, ArchiveConstants.INVENTORY_PATH); SaveInvFolder(inventoryFolder, ArchiveConstants.INVENTORY_PATH);
} }
SaveUsers(); SaveUsers();
@ -334,7 +340,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
/// <summary> /// <summary>
/// Save information for the users that we've collected. /// Save information for the users that we've collected.
/// XXX: Doesn't actually do this yet.
/// </summary> /// </summary>
protected void SaveUsers() protected void SaveUsers()
{ {

1
OpenSim/Region/Framework/Scenes/Tests/SceneObjectLinkingTests.cs
View File

@ -38,7 +38,6 @@ using OpenSim.Region.Framework.Scenes;
using OpenSim.Tests.Common.Mock; using OpenSim.Tests.Common.Mock;
using OpenSim.Tests.Common.Setup; using OpenSim.Tests.Common.Setup;
using log4net; using log4net;
using System.Reflection;
namespace OpenSim.Region.Framework.Scenes.Tests namespace OpenSim.Region.Framework.Scenes.Tests
{ {