refactor: use direct scene reference in inventory archive read request

1 files changed, 5 insertions, 15 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 36e17b4..2c36270 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -69,19 +69,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// </value>
         private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
         private Scene m_aScene;
-        
-        /// <value>
-        /// The comms manager we will use for all comms requests
-        /// </value>
-        protected internal CommunicationsManager CommsManager;
-        protected internal IAssetService AssetService;
 
         public void Initialise(Scene scene, IConfigSource source)
         {            
             if (m_scenes.Count == 0)
             {
                 scene.RegisterModuleInterface<IInventoryArchiverModule>(this);
-                CommsManager = scene.CommsManager;
                 OnInventoryArchiveSaved += SaveInvConsoleCommandCompleted;
                 
                 scene.AddCommand(
@@ -99,11 +92,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         
             m_scenes[scene.RegionInfo.RegionID] = scene;            
         }
-        
-        public void PostInitialise() 
-        {
-            AssetService = m_aScene.AssetService;
-        }
+
+        public void PostInitialise() {}
 
         public void Close() {}
         
@@ -150,7 +140,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (userInfo != null)
                 {
                     InventoryArchiveReadRequest request = 
-                        new InventoryArchiveReadRequest(userInfo, invPath, loadStream, CommsManager, AssetService);                
+                        new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);                
                     UpdateClientWithLoadedNodes(userInfo, request.Execute());
                 }
             }            
@@ -165,7 +155,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                 if (userInfo != null)
                 {
                     InventoryArchiveReadRequest request = 
-                        new InventoryArchiveReadRequest(userInfo, invPath, loadPath, CommsManager, AssetService);                
+                        new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);                
                     UpdateClientWithLoadedNodes(userInfo, request.Execute());
                 }
             }                
@@ -261,7 +251,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
         /// <returns></returns>
         protected CachedUserInfo GetUserInfo(string firstName, string lastName)
         {
-            CachedUserInfo userInfo = CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
+            CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName);
             if (null == userInfo)
             {
                 m_log.ErrorFormat(