ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

* More inventory archive invocation to a proper region module

Browse Source 
* Not ready for use yet
This commit is contained in:
Justin Clarke Casey
2009-02-11 17:34:12 +00:00
parent 6b187ae196
commit 04d6a810b6
5 changed files with 5 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
View File

@@ -47,16 +47,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Scene scene;
protected TarArchiveReader archive;
private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding();
CommunicationsManager commsManager;
public InventoryArchiveReadRequest(Scene currentScene, CommunicationsManager commsManager)
public InventoryArchiveReadRequest(CommunicationsManager commsManager)
{
//List<string> serialisedObjects = new List<string>();
scene = currentScene;
this.commsManager = commsManager;
}
@@ -261,8 +259,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
asset.Metadata.Type = assetType;
asset.Data = data;
scene.AssetCache.AddAsset(asset);
commsManager.AssetCache.AddAsset(asset);
return true;
}

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

@@ -39,14 +39,12 @@ using OpenSim.Framework.Communications;
using OpenSim.Framework.Communications.Cache;
using log4net;
namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
{
public class InventoryArchiveWriteRequest
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
protected Scene scene;
protected TarArchiveWriter archive;
protected CommunicationsManager commsManager;
Dictionary<UUID, int> assetUuids;
@@ -56,9 +54,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
/// </value>
private string m_savePath;
public InventoryArchiveWriteRequest(Scene currentScene, CommunicationsManager commsManager)
public InventoryArchiveWriteRequest(CommunicationsManager commsManager)
{
scene = currentScene;
archive = new TarArchiveWriter();
this.commsManager = commsManager;
assetUuids = new Dictionary<UUID, int>();
@@ -241,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
saveInvDir(inventoryFolder, "");
}
new AssetsRequest(assetUuids.Keys, scene.AssetCache, ReceivedAllAssets).Execute();
new AssetsRequest(assetUuids.Keys, commsManager.AssetCache, ReceivedAllAssets).Execute();
}
}
}

2
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
View File

@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
private Scene m_scene;
public string Name { get { return "Archiver Module"; } }
public string Name { get { return "Region Archiver Module"; } }
public bool IsSharedModule { get { return false; } }