From 04d6a810b6df79b34f9754e0a1b189c070407727 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Wed, 11 Feb 2009 17:34:12 +0000
Subject: * More inventory archive invocation to a proper region module * Not
 ready for use yet

---
 .../Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs       | 7 ++-----
 .../Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs      | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

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
     {
         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;
             }
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index f548296..90e2fcd 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -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();
         }
     }
 }
-- 
cgit v1.1