diff options
author | Justin Clarke Casey | 2009-02-11 17:34:12 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-02-11 17:34:12 +0000 |
commit | 04d6a810b6df79b34f9754e0a1b189c070407727 (patch) | |
tree | fe89d63863557709283264b379d281e3b70b2d42 /OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |
parent | Thank you kindly, FrankNichols for a patch that: (diff) | |
download | opensim-SC_OLD-04d6a810b6df79b34f9754e0a1b189c070407727.zip opensim-SC_OLD-04d6a810b6df79b34f9754e0a1b189c070407727.tar.gz opensim-SC_OLD-04d6a810b6df79b34f9754e0a1b189c070407727.tar.bz2 opensim-SC_OLD-04d6a810b6df79b34f9754e0a1b189c070407727.tar.xz |
* More inventory archive invocation to a proper region module
* Not ready for use yet
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 49006a2..704296c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -47,16 +47,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
47 | { | 47 | { |
48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 48 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
49 | 49 | ||
50 | protected Scene scene; | ||
51 | protected TarArchiveReader archive; | 50 | protected TarArchiveReader archive; |
52 | private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); | 51 | private static System.Text.ASCIIEncoding m_asciiEncoding = new System.Text.ASCIIEncoding(); |
53 | 52 | ||
54 | CommunicationsManager commsManager; | 53 | CommunicationsManager commsManager; |
55 | 54 | ||
56 | public InventoryArchiveReadRequest(Scene currentScene, CommunicationsManager commsManager) | 55 | public InventoryArchiveReadRequest(CommunicationsManager commsManager) |
57 | { | 56 | { |
58 | //List<string> serialisedObjects = new List<string>(); | 57 | //List<string> serialisedObjects = new List<string>(); |
59 | scene = currentScene; | ||
60 | this.commsManager = commsManager; | 58 | this.commsManager = commsManager; |
61 | } | 59 | } |
62 | 60 | ||
@@ -261,8 +259,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
261 | asset.Metadata.Type = assetType; | 259 | asset.Metadata.Type = assetType; |
262 | asset.Data = data; | 260 | asset.Data = data; |
263 | 261 | ||
264 | scene.AssetCache.AddAsset(asset); | 262 | commsManager.AssetCache.AddAsset(asset); |
265 | |||
266 | 263 | ||
267 | return true; | 264 | return true; |
268 | } | 265 | } |