From a87a247f0548d39a8c39b1d28123d7da8db44598 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Jan 2010 07:20:13 +0000
Subject: Revert "Updates all IRegionModules to the new style region modules."

This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
---
 .../Inventory/Transfer/InventoryTransferModule.cs  | 63 ++++++----------------
 1 file changed, 15 insertions(+), 48 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 44906b4..d9a021f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
-using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -40,8 +39,7 @@ using OpenSim.Services.Interfaces;
 
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class InventoryTransferModule : IInventoryTransferModule, ISharedRegionModule
+    public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
     {
         private static readonly ILog m_log
             = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -52,11 +50,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 new Dictionary<UUID, Scene>();
 
         private IMessageTransferModule m_TransferModule = null;
-        private bool m_enabled = true;
 
-        #region ISharedRegionModule Members
+        #region IRegionModule Members
 
-        public void Initialise(IConfigSource config)
+        public void Initialise(Scene scene, IConfigSource config)
         {
             if (config.Configs["Messaging"] != null)
             {
@@ -65,61 +62,31 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                 if (config.Configs["Messaging"].GetString(
                         "InventoryTransferModule", "InventoryTransferModule") !=
                         "InventoryTransferModule")
-                    m_enabled = false;
+                    return;
             }
-        }
-
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
 
-        public void AddRegion(Scene scene)
-        {
-            if (m_enabled)
+            if (!m_Scenelist.Contains(scene))
             {
-                if (!m_Scenelist.Contains(scene))
-                {
-                    m_Scenelist.Add(scene);
+                m_Scenelist.Add(scene);
 
-                    scene.RegisterModuleInterface<IInventoryTransferModule>(this);
+                scene.RegisterModuleInterface<IInventoryTransferModule>(this);
 
-                    scene.EventManager.OnNewClient += OnNewClient;
-                    scene.EventManager.OnClientClosed += ClientLoggedOut;
-                    scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
-                }
+                scene.EventManager.OnNewClient += OnNewClient;
+                scene.EventManager.OnClientClosed += ClientLoggedOut;
+                scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
             }
         }
 
-        public void RegionLoaded(Scene scene)
+        public void PostInitialise()
         {
-            if (m_enabled)
+            if (m_Scenelist.Count > 0)
             {
-                if (m_Scenelist.Count > 0)
-                {
-                    m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
-                    if (m_TransferModule == null)
-                        m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only");
-                }
+                m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
+                if (m_TransferModule == null)
+                    m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only");
             }
         }
 
-        public void RemoveRegion(Scene scene)
-        {
-            if (m_Scenelist.Contains(scene))
-                m_Scenelist.Remove(scene);
-
-            scene.UnregisterModuleInterface<IInventoryTransferModule>(this);
-
-            scene.EventManager.OnNewClient -= OnNewClient;
-            scene.EventManager.OnClientClosed -= ClientLoggedOut;
-            scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
-        }
-
-        public void PostInitialise()
-        {
-        }
-
         public void Close()
         {
         }
-- 
cgit v1.1