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.
---
 .../Region/CoreModules/Agent/IPBan/IPBanModule.cs  | 40 +++++++---------------
 1 file changed, 12 insertions(+), 28 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs')

diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
index f7f2eff..bfe2a71 100644
--- a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
@@ -29,7 +29,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using Mono.Addins;
 using Nini.Config;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
@@ -37,27 +36,21 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Agent.IPBan
 {
-    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
-    public class IPBanModule : ISharedRegionModule 
+    public class IPBanModule : IRegionModule 
     {
-        #region Implementation of ISharedRegionModule
+        #region Implementation of IRegionModule
 
         private List<string> m_bans = new List<string>();
-        private Dictionary<Scene, SceneBanner> SceneBanners = new Dictionary<Scene, SceneBanner>();
 
-        public void Initialise(IConfigSource source)
+        public void Initialise(Scene scene, IConfigSource source)
         {
-        }
-
-        public void AddRegion(Scene scene)
-        {
-            SceneBanners.Add(scene, new SceneBanner(scene, m_bans));
+            new SceneBanner(scene, m_bans);
 
             lock (m_bans)
             {
                 foreach (EstateBan ban in scene.RegionInfo.EstateSettings.EstateBans)
                 {
-                    if (!String.IsNullOrEmpty(ban.BannedHostIPMask))
+                    if (!String.IsNullOrEmpty(ban.BannedHostIPMask)) 
                         m_bans.Add(ban.BannedHostIPMask);
                     if (!String.IsNullOrEmpty(ban.BannedHostNameMask))
                         m_bans.Add(ban.BannedHostNameMask);
@@ -65,12 +58,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             }
         }
 
-        public Type ReplaceableInterface
-        {
-            get { return null; }
-        }
-
-        public void RegionLoaded(Scene scene)
+        public void PostInitialise()
         {
             if (File.Exists("bans.txt"))
             {
@@ -82,18 +70,9 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             }
         }
 
-        public void RemoveRegion(Scene scene)
-        {
-            if(SceneBanners.ContainsKey(scene))
-                SceneBanners.Remove(scene);
-        }
-
-        public void PostInitialise()
-        {
-        }
-
         public void Close()
         {
+            
         }
 
         public string Name
@@ -101,6 +80,11 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             get { return "IPBanModule"; }
         }
 
+        public bool IsSharedModule
+        {
+            get { return true; }
+        }
+
         #endregion
 
         /// <summary>
-- 
cgit v1.1