54 files changed, 1492 insertions, 711 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 1077f4a..7012037 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -35,7 +36,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
 {
-    public class AssetTransactionModule : IRegionModule, IAgentAssetTransactions
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class AssetTransactionModule : ISharedRegionModule, IAgentAssetTransactions
    {
        private readonly Dictionary<UUID, Scene> RegisteredScenes = new Dictionary<UUID, Scene>();
        private bool m_dumpAssetsToFile = false;
@@ -59,9 +61,14 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
            //m_log.Debug("creating AgentAssetTransactionModule");
        }
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+            
+        }
+        public void AddRegion(Scene scene)
        {
            if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
            {
@@ -79,6 +86,23 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
                m_scene = scene;
        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
+                RegisteredScenes.Remove(scene.RegionInfo.RegionID);
+            scene.UnregisterModuleInterface<IAgentAssetTransactions>(this);
+            scene.EventManager.OnNewClient -= NewClient;
+        }
        public void PostInitialise()
        {
        }
@@ -92,11 +116,6 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
            get { return "AgentTransactionModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        #endregion
        public void NewClient(IClientAPI client)
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 2a1355b..886173f 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
        public void RemoveRegion(Scene scene)
        {
-            m_scene.UnregisterModuleInterface<ICapabilitiesModule>(this);
+            scene.UnregisterModuleInterface<ICapabilitiesModule>(this);
        }
        
        public void PostInitialise() {}
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
index bfe2a71..f7f2eff 100644
--- a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
@@ -29,6 +29,7 @@ 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;
@@ -36,21 +37,27 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Agent.IPBan
 {
-    public class IPBanModule : IRegionModule 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class IPBanModule : ISharedRegionModule 
    {
-        #region Implementation of IRegionModule
+        #region Implementation of ISharedRegionModule
        private List<string> m_bans = new List<string>();
+        private Dictionary<Scene, SceneBanner> SceneBanners = new Dictionary<Scene, SceneBanner>();
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
        {
-            new SceneBanner(scene, m_bans);
+        }
+        public void AddRegion(Scene scene)
+        {
+            SceneBanners.Add(scene, 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);
@@ -58,7 +65,12 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
            }
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
        {
            if (File.Exists("bans.txt"))
            {
@@ -70,19 +82,23 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
            }
        }
-        public void Close()
+        public void RemoveRegion(Scene scene)
        {
-            
+            if(SceneBanners.ContainsKey(scene))
+                SceneBanners.Remove(scene);
        }
-        public string Name
+        public void PostInitialise()
+        {
+        }
+        public void Close()
        {
-            get { return "IPBanModule"; }
        }
-        public bool IsSharedModule
+        public string Name
        {
-            get { return true; }
+            get { return "IPBanModule"; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
index 71ff28c..c4d84cb 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Reflection;
 using System.Threading;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -41,7 +42,8 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Agent.TextureDownload
 {
-    public class TextureDownloadModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class TextureDownloadModule : INonSharedRegionModule
    {
        private static readonly ILog m_log
            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -65,11 +67,14 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
        {
        }
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+        }
+        public void AddRegion(Scene scene)
        {
-            
            if (m_scene == null)
            {
                //m_log.Debug("Creating Texture download module");
@@ -90,22 +95,30 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
            }
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
        {
+            get { return null; }
        }
-        public void Close()
+        public void RegionLoaded(Scene scene)
        {
        }
-        public string Name
+        public void RemoveRegion(Scene scene)
        {
-            get { return "TextureDownloadModule"; }
+            if(m_scenes.Contains(scene))
+                m_scenes.Remove(scene);
+            scene.EventManager.OnNewClient -= NewClient;
+            scene.EventManager.OnRemovePresence -= EventManager_OnRemovePresence;
        }
-        public bool IsSharedModule
+        public void Close()
+        {
+        }
+        public string Name
        {
-            get { return false; }
+            get { return "TextureDownloadModule"; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index 7ac8bed..ff87493 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -32,6 +32,7 @@ using System.Reflection;
 using System.Text;
 using System.Threading;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
@@ -45,7 +46,8 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
 {
    public delegate void J2KDecodeDelegate(UUID assetID);
-    public class J2KDecoderModule : IRegionModule, IJ2KDecoder
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class J2KDecoderModule : ISharedRegionModule, IJ2KDecoder
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -58,16 +60,19 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
        /// <summary>Reference to a scene (doesn't matter which one as long as it can load the cache module)</summary>
        private Scene m_scene;
-        #region IRegionModule
+        #region ISharedRegionModule
        public string Name { get { return "J2KDecoderModule"; } }
-        public bool IsSharedModule { get { return true; } }
+        
        public J2KDecoderModule()
        {
        }
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public void AddRegion(Scene scene)
        {
            if (m_scene == null)
                m_scene = scene;
@@ -75,16 +80,30 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
            scene.RegisterModuleInterface<IJ2KDecoder>(this);
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
        {
            m_cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IJ2KDecoder>(this);
+        }
+        public void PostInitialise()
+        {
+        }
        public void Close()
        {
        }
-        #endregion IRegionModule
+        #endregion
        #region IJ2KDecoder
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index ef7dce8..d062361 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -35,7 +36,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Agent.Xfer
 {
-    public class XferModule : IRegionModule, IXfer
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class XferModule : INonSharedRegionModule, IXfer
    {
        private Scene m_scene;
        private Dictionary<string, XferRequest> Requests = new Dictionary<string, XferRequest>();
@@ -52,9 +54,13 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
            public DateTime timeStamp;
        }
       
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
            m_scene.EventManager.OnNewClient += NewClient;
@@ -62,22 +68,28 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
            m_scene.RegisterModuleInterface<IXfer>(this);
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
        {
+            get { return null; }
        }
-        public void Close()
+        public void RegionLoaded(Scene scene)
        {
        }
-        public string Name
+        public void RemoveRegion(Scene scene)
        {
-            get { return "XferModule"; }
+            scene.EventManager.OnNewClient -= NewClient;
+            scene.UnregisterModuleInterface<IXfer>(this);
        }
-        public bool IsSharedModule
+        public void Close()
+        {
+        }
+        public string Name
        {
-            get { return false; }
+            get { return "XferModule"; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 35c59aa..6bbbd56 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,7 +39,8 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
 {
-    public class AvatarFactoryModule : IAvatarFactory, IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class AvatarFactoryModule : IAvatarFactory, ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private Scene m_scene = null;
@@ -75,7 +77,16 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
            return appearance;
        }
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            scene.RegisterModuleInterface<IAvatarFactory>(this);
            scene.EventManager.OnNewClient += NewClient;
@@ -84,9 +95,18 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
            {
                m_scene = scene;
            }
+        }
+        public void RegionLoaded(Scene scene)
+        {
        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IAvatarFactory>(this);
+            scene.EventManager.OnNewClient -= NewClient;
+        }
+        
        public void PostInitialise()
        {
        }
@@ -100,11 +120,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
            get { return "Default Avatar Factory"; }
        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        public void NewClient(IClientAPI client)
        {
            client.OnAvatarNowWearing += AvatarIsWearing;
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 61b6d65..b7d12aa 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
+using Mono.Addins;
 using Nini.Config;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
@@ -34,7 +35,8 @@ using OpenMetaverse;
 namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
 {
-    public class CombatModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class CombatModule : ISharedRegionModule
    {
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -53,7 +55,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
        /// </summary>
        /// <param name="scene"></param>
        /// <param name="config"></param>
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+            
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            lock (m_scenel)
            {
@@ -71,6 +83,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
            scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.EventManager.OnAvatarKilled -= KillAvatar;
+            scene.EventManager.OnAvatarEnteringNewParcel -= AvatarEnteringParcel;
+            m_scenel.Remove(scene.RegionInfo.RegionHandle);
+        }
        public void PostInitialise()
        {
        }
@@ -84,11 +107,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
            get { return "CombatModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        private void KillAvatar(uint killerObjectLocalID, ScenePresence DeadAvatar)
        {
            if (killerObjectLocalID == 0)
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 72ec869..ecffc7a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -25,9 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -37,28 +39,46 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Dialog
 {
-    public class DialogModule : IRegionModule, IDialogModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class DialogModule : ISharedRegionModule, IDialogModule
    { 
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
        protected Scene m_scene;
        
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
            m_scene.RegisterModuleInterface<IDialogModule>(this);
-            
            m_scene.AddCommand(
                this, "alert", "alert <first> <last> <message>", "Send an alert to a user", HandleAlertConsoleCommand);
            m_scene.AddCommand(
                this, "alert general", "alert general <message>", "Send an alert to everyone", HandleAlertConsoleCommand);
        }
-        
-        public void PostInitialise() {}
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IDialogModule>(this);
+        }
+        public void PostInitialise() { }
        public void Close() {}
        public string Name { get { return "Dialog Module"; } }
-        public bool IsSharedModule { get { return false; } }
        
        public void SendAlertToUser(IClientAPI client, string message)
        {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 086d4fe..7254180 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -81,7 +82,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        - Terminate Friendship messages (single)
     */
-    public class FriendsModule : IRegionModule, IFriendsModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class FriendsModule : ISharedRegionModule, IFriendsModule
    {
        private class Transaction
        {
@@ -111,9 +113,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
        private IGridService m_gridServices = null;
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+            
+        }
+        public void PostInitialise()
+        {
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            lock (m_scenes)
            {
@@ -128,9 +144,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                if (!m_scenes.ContainsKey(scene.RegionInfo.RegionHandle))
                    m_scenes[scene.RegionInfo.RegionHandle] = scene;
            }
-            
            scene.RegisterModuleInterface<IFriendsModule>(this);
-            
            scene.EventManager.OnNewClient += OnNewClient;
            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
            scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
@@ -138,29 +154,41 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
            scene.EventManager.OnClientClosed += ClientClosed;
        }
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
        {
            if (m_scenes.Count > 0)
            {
-                m_TransferModule = m_initialScene.RequestModuleInterface<IMessageTransferModule>();
+                m_TransferModule = scene.RequestModuleInterface<IMessageTransferModule>();
-                m_gridServices = m_initialScene.GridService;
+                m_gridServices = scene.GridService;
            }
            if (m_TransferModule == null)
                m_log.Error("[FRIENDS]: Unable to find a message transfer module, friendship offers will not work");
        }
-        public void Close()
+        public void RemoveRegion(Scene scene)
        {
+            MainServer.Instance.RemoveXmlRPCHandler("presence_update_bulk");
+            MainServer.Instance.RemoveXmlRPCHandler("terminate_friend");
+            if (m_scenes.ContainsKey(scene.RegionInfo.RegionHandle))
+                m_scenes.Remove(scene.RegionInfo.RegionHandle);
+            scene.UnregisterModuleInterface<IFriendsModule>(this);
+            scene.EventManager.OnNewClient -= OnNewClient;
+            scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
+            scene.EventManager.OnAvatarEnteringNewParcel -= AvatarEnteringParcel;
+            scene.EventManager.OnMakeChildAgent -= MakeChildAgent;
+            scene.EventManager.OnClientClosed -= ClientClosed;
        }
-        public string Name
+        public void Close()
        {
-            get { return "FriendsModule"; }
        }
-        public bool IsSharedModule
+        public string Name
        {
-            get { return true; }
+            get { return "FriendsModule"; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 8ce5092..c306f94 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -25,8 +25,10 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -37,23 +39,41 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.Gestures
 {
-    public class GesturesModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class GesturesModule : INonSharedRegionModule
    { 
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
        protected Scene m_scene;
        
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
-            
            m_scene.EventManager.OnNewClient += OnNewClient;
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if(m_scene == scene)
+                m_scene = null;
+            scene.EventManager.OnNewClient -= OnNewClient;
+        }
        
-        public void PostInitialise() {}
        public void Close() {}
        public string Name { get { return "Gestures Module"; } }
-        public bool IsSharedModule { get { return false; } }
        
        private void OnNewClient(IClientAPI client)
        {
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
index 50171a3..3914f2e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
@@ -25,7 +25,9 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Collections.Generic;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -34,7 +36,8 @@ using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.Gods
 {
-    public class GodsModule : IRegionModule, IGodsModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class GodsModule : INonSharedRegionModule, IGodsModule
    {
        /// <summary>Special UUID for actions that apply to all agents</summary>
        private static readonly UUID ALL_AGENTS = new UUID("44e87126-e794-4ded-05b3-7c42da3d5cdb");
@@ -42,17 +45,34 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods
        protected Scene m_scene;
        protected IDialogModule m_dialogModule;
        
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+            
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
            m_dialogModule = m_scene.RequestModuleInterface<IDialogModule>();
            m_scene.RegisterModuleInterface<IGodsModule>(this);
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IGodsModule>(this);
+        }
        
-        public void PostInitialise() {}
        public void Close() {}
        public string Name { get { return "Gods Module"; } }
-        public bool IsSharedModule { get { return false; } }
        
        public void RequestGodlikePowers(
            UUID agentID, UUID sessionID, UUID token, bool godLike, IClientAPI controllingClient)
diff --git a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
index 31363e5..7ff8d30 100644
--- a/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
@@ -25,9 +25,11 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -36,7 +38,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Groups
 {
-    public class GroupsModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class GroupsModule : ISharedRegionModule
    {
        private static readonly ILog m_log =
            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -55,9 +58,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
        private static GroupMembershipData osGroup =
                new GroupMembershipData();
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            IConfig groupsConfig = config.Configs["Groups"];
@@ -76,7 +79,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
                if (groupsConfig.GetString("Module", "Default") != "Default")
                    return;
            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
            lock (m_SceneList)
            {
                if (!m_SceneList.Contains(scene))
@@ -99,6 +110,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
            scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_SceneList.Contains(scene))
+                m_SceneList.Remove(scene);
+            scene.EventManager.OnNewClient -= OnNewClient;
+            scene.EventManager.OnClientClosed -= OnClientClosed;
+            scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
+        }
        public void PostInitialise()
        {
        }
@@ -123,11 +147,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Groups
            get { return "GroupsModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        #endregion
        private void OnNewClient(IClientAPI client)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 9a68749..e1bde4b 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -24,9 +24,12 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -36,7 +39,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class InstantMessageModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class InstantMessageModule : ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -47,11 +51,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        
        private readonly List<Scene> m_scenes = new List<Scene>();
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
        private IMessageTransferModule m_TransferModule = null;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            if (config.Configs["Messaging"] != null)
            {
@@ -62,7 +66,15 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            }
            
            m_enabled = true;
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
            lock (m_scenes)
            {
                if (!m_scenes.Contains(scene))
@@ -74,6 +86,27 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            }
        }
+        public void RegionLoaded(Scene scene)
+        {
+            if (!m_enabled)
+                return;
+            m_TransferModule =
+                m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
+            if (m_TransferModule == null)
+                m_log.Error("[INSTANT MESSAGE]: No message transfer module, " +
+                "IM will not work!");
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_scenes.Contains(scene))
+                m_scenes.Remove(scene);
+            scene.EventManager.OnClientConnect -= OnClientConnect;
+            scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
+        }
        void OnClientConnect(IClientCore client)
        {
            IClientIM clientIM;
@@ -85,15 +118,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        public void PostInitialise()
        {
-            if (!m_enabled)
-                return;
-            
-            m_TransferModule =
-                m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
-            if (m_TransferModule == null)
-                m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
-                "IM will not work!");
        }
        public void Close()
@@ -105,11 +129,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            get { return "InstantMessageModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        #endregion
        public void OnInstantMessage(IClientAPI client, GridInstantMessage im)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index e5159b3..16bdfdd 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -40,7 +41,8 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class MessageTransferModule : IRegionModule, IMessageTransferModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class MessageTransferModule : ISharedRegionModule, IMessageTransferModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -50,8 +52,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        protected Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>();
        public event UndeliveredMessage OnUndeliveredMessage;
+        private bool m_enabled = true;
-        public virtual void Initialise(Scene scene, IConfigSource config)
+        public virtual void Initialise(IConfigSource config)
        {
            IConfig cnf = config.Configs["Messaging"];
            if (cnf != null && cnf.GetString(
@@ -59,29 +62,51 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                    "MessageTransferModule")
            {
                m_log.Debug("[MESSAGE TRANSFER]: Disabled by configuration");
-                return;
+                m_enabled = false;
            }
            cnf = config.Configs["Startup"];
            if (cnf != null)
                m_Gridmode = cnf.GetBoolean("gridmode", false);
+        }
-            // m_Enabled = true;
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
-            lock (m_Scenes)
+        public void AddRegion(Scene scene)
+        {
+            if (m_enabled)
            {
-                if (m_Scenes.Count == 0)
+                lock (m_Scenes)
                {
-                    MainServer.Instance.AddXmlRPCHandler(
+                    if (m_Scenes.Count == 0)
-                        "grid_instant_message", processXMLRPCGridInstantMessage);
+                    {
-                }
+                        MainServer.Instance.AddXmlRPCHandler(
+                            "grid_instant_message", processXMLRPCGridInstantMessage);
+                    }
-                m_log.Debug("[MESSAGE TRANSFER]: Message transfer module active");
+                    m_log.Debug("[MESSAGE TRANSFER]: Message transfer module active");
-                scene.RegisterModuleInterface<IMessageTransferModule>(this);
+                    scene.RegisterModuleInterface<IMessageTransferModule>(this);
-                m_Scenes.Add(scene);
+                    m_Scenes.Add(scene);
+                }
            }
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_Scenes.Contains(scene))
+                m_Scenes.Remove(scene);
+            MainServer.Instance.RemoveXmlRPCHandler(
+                            "grid_instant_message");
+            scene.UnregisterModuleInterface<IMessageTransferModule>(this);
+        }
        public virtual void PostInitialise()
        {
        }
@@ -95,11 +120,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            get { return "MessageTransferModule"; }
        }
-        public virtual bool IsSharedModule
-        {
-            get { return true; }
-        }
        public virtual void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
        {
            UUID toAgentID = new UUID(im.toAgentID);
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 2d4a635..3570495 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -28,6 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,7 +40,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.MuteList
 {
-    public class MuteListModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class MuteListModule : ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -47,7 +49,7 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
        private List<Scene> m_SceneList = new List<Scene>();
        private string m_RestURL = String.Empty;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            if (!enabled)
                return;
@@ -66,19 +68,24 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
                enabled = false;
                return;
            }
+            m_RestURL = cnf.GetString("MuteListURL", "");
+            if (m_RestURL == "")
+            {
+                m_log.Error("[MUTE LIST] Module was enabled, but no URL is given, disabling");
+                enabled = false;
+                return;
+            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
            lock (m_SceneList)
            {
-                if (m_SceneList.Count == 0)
-                {
-                    m_RestURL = cnf.GetString("MuteListURL", "");
-                    if (m_RestURL == "")
-                    {
-                        m_log.Error("[MUTE LIST] Module was enabled, but no URL is given, disabling");
-                        enabled = false;
-                        return;
-                    }
-                }
                if (!m_SceneList.Contains(scene))
                    m_SceneList.Add(scene);
@@ -86,6 +93,18 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
            }
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_SceneList.Contains(scene))
+                m_SceneList.Remove(scene);
+            scene.EventManager.OnNewClient -= OnNewClient;
+        }
        public void PostInitialise()
        {
            if (!enabled)
@@ -102,11 +121,6 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
            get { return "MuteListModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
-        
        public void Close()
        {
        }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 450897c..6c4d0bf 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -28,6 +28,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -40,7 +41,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class OfflineMessageModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class OfflineMessageModule : ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -49,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        private string m_RestURL = String.Empty;
        private bool m_ForwardOfflineGroupMessages = true;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            if (!enabled)
                return;
@@ -83,14 +85,23 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                        return;
                    }
                }
-                if (!m_SceneList.Contains(scene))
-                    m_SceneList.Add(scene);
-                scene.EventManager.OnNewClient += OnNewClient;
            }
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (!m_SceneList.Contains(scene))
+                m_SceneList.Add(scene);
+            scene.EventManager.OnNewClient += OnNewClient;
+        }
+        public void RegionLoaded(Scene scene)
        {
            if (!enabled)
                return;
@@ -120,16 +131,22 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
            m_log.Debug("[OFFLINE MESSAGING] Offline messages enabled");
        }
-        public string Name
+        public void RemoveRegion(Scene scene)
        {
-            get { return "OfflineMessageModule"; }
+            if (m_SceneList.Contains(scene))
+                m_SceneList.Remove(scene);
+            scene.EventManager.OnNewClient -= OnNewClient;
        }
-        public bool IsSharedModule
+        public void PostInitialise()
+        {
+        }
+        public string Name
        {
-            get { return true; }
+            get { return "OfflineMessageModule"; }
        }
-        
        public void Close()
        {
        }
@@ -163,24 +180,27 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        private void RetrieveInstantMessages(IClientAPI client)
        {
-            m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
+            if (m_RestURL != "")
+            {
+                m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId);
-            List<GridInstantMessage>msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
+                List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
-                    "POST", m_RestURL+"/RetrieveMessages/", client.AgentId);
+                        "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
-            foreach (GridInstantMessage im in msglist)
+                foreach (GridInstantMessage im in msglist)
-            {
+                {
-                // client.SendInstantMessage(im);
+                    // client.SendInstantMessage(im);
-                // Send through scene event manager so all modules get a chance
+                    // Send through scene event manager so all modules get a chance
-                // to look at this message before it gets delivered.
+                    // to look at this message before it gets delivered.
-                //
+                    //
-                // Needed for proper state management for stored group
+                    // Needed for proper state management for stored group
-                // invitations
+                    // invitations
-                //
+                    //
-                Scene s = FindScene(client.AgentId);
+                    Scene s = FindScene(client.AgentId);
-                if (s != null)
+                    if (s != null)
-                    s.EventManager.TriggerIncomingInstantMessage(im);
+                        s.EventManager.TriggerIncomingInstantMessage(im);
+                }
            }
        }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index f5ab454..f5498f4 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -24,11 +24,14 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Net;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -39,7 +42,8 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 {
-    public class PresenceModule : IRegionModule, IPresenceModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class PresenceModule : ISharedRegionModule, IPresenceModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -59,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
        public event PresenceChange OnPresenceChange;
        public event BulkPresenceData OnBulkPresenceData;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            lock (m_Scenes)
            {
@@ -78,28 +82,38 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                        m_Gridmode = cnf.GetBoolean("gridmode", false);
                    m_Enabled = true;
-                    m_initialScene = scene;
                }
+            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (m_Enabled)
+            {
+                m_initialScene = scene;
                if (m_Gridmode)
                    NotifyMessageServerOfStartup(scene);
                m_Scenes.Add(scene);
-            }
-            scene.RegisterModuleInterface<IPresenceModule>(this);
+                scene.RegisterModuleInterface<IPresenceModule>(this);
-            scene.EventManager.OnNewClient += OnNewClient;
+                scene.EventManager.OnNewClient += OnNewClient;
-            scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
+                scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
-            scene.EventManager.OnMakeChildAgent += OnMakeChildAgent;
+                scene.EventManager.OnMakeChildAgent += OnMakeChildAgent;
+            }
        }
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
        {
        }
-        public void Close()
+        public void RemoveRegion(Scene scene)
        {
            if (!m_Gridmode || !m_Enabled)
                return;
@@ -116,21 +130,28 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                }
            }
-            lock (m_Scenes)
+            NotifyMessageServerOfShutdown(scene);
-            {
+            if(m_Scenes.Contains(scene))
-                foreach (Scene scene in m_Scenes)
+                m_Scenes.Remove(scene);
-                    NotifyMessageServerOfShutdown(scene);
-            }
+            scene.UnregisterModuleInterface<IPresenceModule>(this);
+            scene.EventManager.OnNewClient -= OnNewClient;
+            scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene;
+            scene.EventManager.OnMakeChildAgent -= OnMakeChildAgent;
        }
-        public string Name
+        public void PostInitialise()
        {
-            get { return "PresenceModule"; }
        }
-        public bool IsSharedModule
+        public void Close()
        {
-            get { return true; }
+        }
+        public string Name
+        {
+            get { return "PresenceModule"; }
        }
        public void RequestBulkPresenceData(UUID[] users)
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index ecd60bd..a04ab22 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -41,10 +42,11 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    /// <summary>
    /// This module loads and saves OpenSimulator inventory archives
    /// </summary>
-    public class InventoryArchiverModule : IRegionModule, IInventoryArchiverModule
+    public class InventoryArchiverModule : ISharedRegionModule, IInventoryArchiverModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
@@ -82,18 +84,28 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
            DisablePresenceChecks = disablePresenceChecks;
        }
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            if (m_scenes.Count == 0)
            {
                scene.RegisterModuleInterface<IInventoryArchiverModule>(this);
                OnInventoryArchiveSaved += SaveInvConsoleCommandCompleted;
-                
                scene.AddCommand(
                    this, "load iar",
                    "load iar <first> <last> <inventory path> <password> [<archive path>]",
-                    "Load user inventory archive.", HandleLoadInvConsoleCommand); 
+                    "Load user inventory archive.", HandleLoadInvConsoleCommand);
-                
                scene.AddCommand(
                    this, "save iar",
                    "save iar <first> <last> <inventory path> <password> [<archive path>]",
@@ -101,10 +113,21 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                m_aScene = scene;
            }
-                        
            m_scenes[scene.RegionInfo.RegionID] = scene;
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IInventoryArchiverModule>(this);
+            if(m_scenes.ContainsKey(scene.RegionInfo.RegionID))
+                m_scenes.Remove(scene.RegionInfo.RegionID);
+        }
        public void PostInitialise() {}
        public void Close() {}
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d9a021f..44906b4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,7 +40,8 @@ using OpenSim.Services.Interfaces;
 namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
 {
-    public class InventoryTransferModule : IInventoryTransferModule, IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class InventoryTransferModule : IInventoryTransferModule, ISharedRegionModule
    {
        private static readonly ILog m_log
            = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -50,10 +52,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                new Dictionary<UUID, Scene>();
        private IMessageTransferModule m_TransferModule = null;
+        private bool m_enabled = true;
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            if (config.Configs["Messaging"] != null)
            {
@@ -62,31 +65,61 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
                if (config.Configs["Messaging"].GetString(
                        "InventoryTransferModule", "InventoryTransferModule") !=
                        "InventoryTransferModule")
-                    return;
+                    m_enabled = false;
            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
-            if (!m_Scenelist.Contains(scene))
+        public void AddRegion(Scene scene)
+        {
+            if (m_enabled)
            {
-                m_Scenelist.Add(scene);
+                if (!m_Scenelist.Contains(scene))
+                {
+                    m_Scenelist.Add(scene);
-                scene.RegisterModuleInterface<IInventoryTransferModule>(this);
+                    scene.RegisterModuleInterface<IInventoryTransferModule>(this);
-                scene.EventManager.OnNewClient += OnNewClient;
+                    scene.EventManager.OnNewClient += OnNewClient;
-                scene.EventManager.OnClientClosed += ClientLoggedOut;
+                    scene.EventManager.OnClientClosed += ClientLoggedOut;
-                scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
+                    scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
+                }
            }
        }
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
        {
-            if (m_Scenelist.Count > 0)
+            if (m_enabled)
            {
-                m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
+                if (m_Scenelist.Count > 0)
-                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()
        {
        }
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index 261bd6c..973d27f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -37,36 +38,72 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Lure
 {
-    public class LureModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class LureModule : ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private readonly List<Scene> m_scenes = new List<Scene>();
+        private bool m_enabled = true;
        private IMessageTransferModule m_TransferModule = null;
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            if (config.Configs["Messaging"] != null)
            {
                if (config.Configs["Messaging"].GetString(
                        "LureModule", "LureModule") !=
                        "LureModule")
-                    return;
+                    m_enabled = false;
            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
-            lock (m_scenes)
+        public void AddRegion(Scene scene)
+        {
+            if (m_enabled)
            {
-                if (!m_scenes.Contains(scene))
+                lock (m_scenes)
                {
-                    m_scenes.Add(scene);
+                    if (!m_scenes.Contains(scene))
-                    scene.EventManager.OnNewClient += OnNewClient;
+                    {
-                    scene.EventManager.OnIncomingInstantMessage +=
+                        m_scenes.Add(scene);
-                            OnGridInstantMessage;
+                        scene.EventManager.OnNewClient += OnNewClient;
+                        scene.EventManager.OnIncomingInstantMessage +=
+                                OnGridInstantMessage;
+                    }
                }
            }
        }
+        public void RegionLoaded(Scene scene)
+        {
+            if (m_enabled)
+            {
+                m_TransferModule =
+                    m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
+                if (m_TransferModule == null)
+                    m_log.Error("[INSTANT MESSAGE]: No message transfer module, " +
+                    "lures will not work!");
+            }
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_scenes.Contains(scene))
+                m_scenes.Remove(scene);
+            scene.EventManager.OnNewClient -= OnNewClient;
+            scene.EventManager.OnIncomingInstantMessage -=
+                    OnGridInstantMessage;
+        }
        void OnNewClient(IClientAPI client)
        {
            client.OnInstantMessage += OnInstantMessage;
@@ -76,12 +113,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
        public void PostInitialise()
        {
-            m_TransferModule =
-                m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
-            if (m_TransferModule == null)
-                m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
-                "lures will not work!");
        }
        public void Close()
diff --git a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
index 63a93aa..748b42c 100644
--- a/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
+++ b/OpenSim/Region/CoreModules/Avatar/ObjectCaps/ObjectAdd.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
@@ -41,24 +42,54 @@ using Caps=OpenSim.Framework.Capabilities.Caps;
 namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
 {
-    public class ObjectAdd : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class ObjectAdd : ISharedRegionModule
    {
        private static readonly ILog m_log =
            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private Scene m_scene;
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene pScene, IConfigSource pSource)
+        public void Initialise(IConfigSource pSource)
        {
-            m_scene = pScene;
+            
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
            m_scene.EventManager.OnRegisterCaps += RegisterCaps;
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.EventManager.OnRegisterCaps -= RegisterCaps;
+        }
        public void PostInitialise()
        {
            
        }
+        public void Close()
+        {
+        }
+        public string Name
+        {
+            get { return "ObjectAddModule"; }
+        }
        public void RegisterCaps(UUID agentID, Caps caps)
        {
            UUID capuuid = UUID.Random();
@@ -348,22 +379,6 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
                Array.Reverse(resultbytes);
            return String.Format("<binary encoding=\"base64\">{0}</binary>",Convert.ToBase64String(resultbytes));
        }
-        public void Close()
-        {
-            
-        }
-        public string Name
-        {
-            get { return "ObjectAddModule"; }
-        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        #endregion
    }
 }
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index 8cf58c6..7fcb0e1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -30,6 +30,7 @@ using System.Collections;
 using System.Globalization;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,20 +39,17 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Profiles
 {
-    public class AvatarProfilesModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class AvatarProfilesModule : INonSharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private Scene m_scene;
        private IProfileModule m_profileModule = null;
        private bool m_enabled = true;
-        public AvatarProfilesModule()
+        #region INonSharedRegionModule Members
-        {
-        }
-        #region IRegionModule Members
+        public void Initialise(IConfigSource config)
-        public void Initialise(Scene scene, IConfigSource config)
        {
            IConfig profileConfig = config.Configs["Profile"];
            if (profileConfig != null)
@@ -62,30 +60,38 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
                    return;
                }
            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
            m_scene = scene;
            m_scene.EventManager.OnNewClient += NewClient;
        }
-        public void PostInitialise()
+        public void RegionLoaded(Scene scene)
        {
            if (!m_enabled)
                return;
            m_profileModule = m_scene.RequestModuleInterface<IProfileModule>();
        }
-        public void Close()
+        public void RemoveRegion(Scene scene)
        {
+            scene.EventManager.OnNewClient -= NewClient;
        }
-        public string Name
+        public void Close()
        {
-            get { return "AvatarProfilesModule"; }
        }
-        public bool IsSharedModule
+        public string Name
        {
-            get { return false; }
+            get { return "AvatarProfilesModule"; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
index 0c6cb1b..1ee6f0d 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs
@@ -32,6 +32,7 @@ using System.Net;
 using System.Reflection;
 using System.Threading;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Packets;
@@ -52,11 +53,13 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
        public OSDMap body;
    }
-    public class EventQueueGetModule : IEventQueue, IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class EventQueueGetModule : IEventQueue, INonSharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        protected Scene m_scene = null;
        private IConfigSource m_gConfig;
+        private IConfig m_startupConfig;
        bool enabledYN = false;
        
        private Dictionary<UUID, int> m_ids = new Dictionary<UUID, int>();
@@ -65,23 +68,31 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
        private Dictionary<UUID, UUID> m_QueueUUIDAvatarMapping = new Dictionary<UUID, UUID>();
        private Dictionary<UUID, UUID> m_AvatarQueueUUIDMapping = new Dictionary<UUID, UUID>();
            
-        #region IRegionModule methods
+        #region INonSharedRegionModule methods
-        public virtual void Initialise(Scene scene, IConfigSource config)
+        public virtual void Initialise(IConfigSource config)
        {
            m_gConfig = config;
-            IConfig startupConfig = m_gConfig.Configs["Startup"];
+            m_startupConfig = m_gConfig.Configs["Startup"];
+        }
-            ReadConfigAndPopulate(scene, startupConfig, "Startup");
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
+            ReadConfigAndPopulate(scene, m_startupConfig, "Startup");
            if (enabledYN)
            {
                m_scene = scene;
                scene.RegisterModuleInterface<IEventQueue>(this);
-                
                // Register fallback handler
                // Why does EQG Fail on region crossings!
-                
                //scene.CommsManager.HttpServer.AddLLSDHandler("/CAPS/EQG/", EventQueueFallBack);
                scene.EventManager.OnNewClient += OnNewClient;
@@ -99,18 +110,21 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
            {
                m_gConfig = null;
            }
-        
        }
-        private void ReadConfigAndPopulate(Scene scene, IConfig startupConfig, string p)
+        public void RegionLoaded(Scene scene)
        {
-            enabledYN = startupConfig.GetBoolean("EventQueue", true);
        }
-        public void PostInitialise()
+        public void RemoveRegion(Scene scene)
        {
        }
+        private void ReadConfigAndPopulate(Scene scene, IConfig startupConfig, string p)
+        {
+            enabledYN = startupConfig.GetBoolean("EventQueue", true);
+        }
        public virtual void Close()
        {
        }
@@ -120,10 +134,6 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
            get { return "EventQueueGetModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        #endregion
        /// <summary>
diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index f15f8f6..0135d33 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -25,10 +25,12 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -39,7 +41,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Framework.Monitoring
 {
-    public class MonitorModule : IRegionModule 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class MonitorModule : INonSharedRegionModule 
    {
        private Scene m_scene;
        private readonly List<IMonitor> m_monitors = new List<IMonitor>();
@@ -62,9 +65,19 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
            }
        }
-        #region Implementation of IRegionModule
+        #region Implementation of INonSharedRegionModule
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+            
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
@@ -77,6 +90,51 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
            MainServer.Instance.AddHTTPHandler("/monitorstats/" + m_scene.RegionInfo.RegionID + "/", StatsPage);
        }
+        public void RegionLoaded(Scene scene)
+        {
+            m_monitors.Add(new AgentCountMonitor(m_scene));
+            m_monitors.Add(new ChildAgentCountMonitor(m_scene));
+            m_monitors.Add(new GCMemoryMonitor());
+            m_monitors.Add(new ObjectCountMonitor(m_scene));
+            m_monitors.Add(new PhysicsFrameMonitor(m_scene));
+            m_monitors.Add(new PhysicsUpdateFrameMonitor(m_scene));
+            m_monitors.Add(new PWSMemoryMonitor());
+            m_monitors.Add(new ThreadCountMonitor());
+            m_monitors.Add(new TotalFrameMonitor(m_scene));
+            m_monitors.Add(new EventFrameMonitor(m_scene));
+            m_monitors.Add(new LandFrameMonitor(m_scene));
+            m_monitors.Add(new LastFrameTimeMonitor(m_scene));
+            m_alerts.Add(new DeadlockAlert(m_monitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor));
+            foreach (IAlert alert in m_alerts)
+            {
+                alert.OnTriggerAlert += OnTriggerAlert;
+            }
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            MainServer.Instance.RemoveHTTPHandler("", "/monitorstats/" + m_scene.RegionInfo.RegionID + "/");
+            m_monitors.Clear();
+            foreach (IAlert alert in m_alerts)
+            {
+                alert.OnTriggerAlert -= OnTriggerAlert;
+            }
+            m_alerts.Clear();
+        }
+        public void Close()
+        {
+        }
+        public string Name
+        {
+            get { return "Region Health Monitoring Module"; }
+        }
        public Hashtable StatsPage(Hashtable request)
        {
            // If request was for a specific monitor
@@ -132,49 +190,10 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
            return ereply;
        }
-        public void PostInitialise()
-        {
-            m_monitors.Add(new AgentCountMonitor(m_scene));
-            m_monitors.Add(new ChildAgentCountMonitor(m_scene));
-            m_monitors.Add(new GCMemoryMonitor());
-            m_monitors.Add(new ObjectCountMonitor(m_scene));
-            m_monitors.Add(new PhysicsFrameMonitor(m_scene));
-            m_monitors.Add(new PhysicsUpdateFrameMonitor(m_scene));
-            m_monitors.Add(new PWSMemoryMonitor());
-            m_monitors.Add(new ThreadCountMonitor());
-            m_monitors.Add(new TotalFrameMonitor(m_scene));
-            m_monitors.Add(new EventFrameMonitor(m_scene));
-            m_monitors.Add(new LandFrameMonitor(m_scene));
-            m_monitors.Add(new LastFrameTimeMonitor(m_scene));
-            m_alerts.Add(new DeadlockAlert(m_monitors.Find(x => x is LastFrameTimeMonitor) as LastFrameTimeMonitor));
-            foreach (IAlert alert in m_alerts)
-            {
-                alert.OnTriggerAlert += OnTriggerAlert;
-            }
-        }
        void OnTriggerAlert(System.Type reporter, string reason, bool fatal)
        {
            m_log.Error("[Monitor] " + reporter.Name + " for " + m_scene.RegionInfo.RegionName + " reports " + reason + " (Fatal: " + fatal + ")");
        }
-        public void Close()
-        {
-            
-        }
-        public string Name
-        {
-            get { return "Region Health Monitoring Module"; }
-        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        #endregion
    }
 }
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
index 0b54746..f9c594b 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
@@ -1,4 +1,4 @@
-/*
+/*
 * Copyright (c) Contributors, http://opensimulator.org/
 * See CONTRIBUTORS.TXT for a full list of copyright holders.
 *
@@ -32,6 +32,7 @@ using System.Net;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using Nwc.XmlRpc;
@@ -46,7 +47,8 @@ using OpenSim.Region.Framework.Interfaces;
 namespace OpenSim.Region.CoreModules.Hypergrid
 {
-    public class HGStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class HGStandaloneLoginModule : ISharedRegionModule, ILoginServiceToRegionsConnector
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -56,47 +58,58 @@ namespace OpenSim.Region.CoreModules.Hypergrid
        protected bool m_enabled = false; // Module is only enabled if running in standalone mode
        protected HGLoginAuthService m_loginService;
+        private bool authenticate = true;
+        private string welcomeMessage = "Welcome to OpenSim";
+        private IConfig startupConfig;
+        private IConfig standaloneConfig;
+                    
+        #region ISharedRegionModule Members
+        public void Initialise(IConfigSource source)
+        {
+            startupConfig = source.Configs["Startup"];
+            standaloneConfig = source.Configs["StandAlone"];
+            if (standaloneConfig != null)
+            {
+                authenticate = standaloneConfig.GetBoolean("accounts_authenticate", true);
+                welcomeMessage = standaloneConfig.GetString("welcome_message");
+            }
+            m_enabled = !startupConfig.GetBoolean("gridmode", false);
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
-        #region IRegionModule Members
+        public void AddRegion(Scene scene)
+        {
+        }
-        public void Initialise(Scene scene, IConfigSource source)
+        public void RegionLoaded(Scene scene)
        {
            if (m_firstScene == null)
            {
                m_firstScene = scene;
-                IConfig startupConfig = source.Configs["Startup"];
-                if (startupConfig != null)
-                {
-                    m_enabled = !startupConfig.GetBoolean("gridmode", false);
-                }
                if (m_enabled)
                {
                    m_log.Debug("[HGLogin]: HGlogin module enabled");
-                    bool authenticate = true;
-                    string welcomeMessage = "Welcome to OpenSim";
-                    IConfig standaloneConfig = source.Configs["StandAlone"];
-                    if (standaloneConfig != null)
-                    {
-                        authenticate = standaloneConfig.GetBoolean("accounts_authenticate", true);
-                        welcomeMessage = standaloneConfig.GetString("welcome_message");
-                    }
                    //TODO: fix casting.
                    LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder;
-                   
                    IHttpServer httpServer = MainServer.Instance;
                    //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
-                    m_loginService 
+                    m_loginService
                        = new HGLoginAuthService(
-                            (UserManagerBase)m_firstScene.CommsManager.UserAdminService, 
+                            (UserManagerBase)m_firstScene.CommsManager.UserAdminService,
-                            welcomeMessage, 
+                            welcomeMessage,
-                            m_firstScene.CommsManager.InterServiceInventoryService, 
+                            m_firstScene.CommsManager.InterServiceInventoryService,
-                            m_firstScene.CommsManager.NetworkServersInfo, 
+                            m_firstScene.CommsManager.NetworkServersInfo,
-                            authenticate, 
+                            authenticate,
-                            rootFolder, 
+                            rootFolder,
                            this);
                    httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod);
@@ -113,6 +126,19 @@ namespace OpenSim.Region.CoreModules.Hypergrid
            }
        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (scene == m_firstScene)
+            {
+                IHttpServer httpServer = MainServer.Instance;
+                httpServer.RemoveXmlRPCHandler("hg_login");
+                httpServer.RemoveXmlRPCHandler("check_auth_session");
+                httpServer.RemoveXmlRPCHandler("get_avatar_appearance");
+                httpServer.RemoveXmlRPCHandler("update_avatar_appearance");
+            }
+            m_scenes.Remove(scene);
+        }
        public void PostInitialise()
        {
@@ -128,11 +154,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid
            get { return "HGStandaloneLoginModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        #endregion
        protected void AddScene(Scene scene)
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
index 0f2ba32..4534024 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
@@ -32,6 +32,7 @@ using System.Net;
 using System.Reflection;
 using System.Text;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -42,7 +43,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.InterGrid
 {
-    public class OGSRadmin : IRegionModule 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class OGSRadmin : ISharedRegionModule 
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private readonly List<Scene> m_scenes = new List<Scene>();
@@ -56,7 +58,6 @@ namespace OpenSim.Region.CoreModules.InterGrid
            get { return "OGS Supporting RAdmin"; }
        }
        public void Initialise(IConfigSource source)
        {
            m_settings = source;
@@ -67,6 +68,11 @@ namespace OpenSim.Region.CoreModules.InterGrid
        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
        public void AddRegion(Scene scene)
        {
            lock (m_scenes)
@@ -77,15 +83,11 @@ namespace OpenSim.Region.CoreModules.InterGrid
        {
            lock (m_scenes)
                m_scenes.Remove(scene);
+            MainServer.Instance.RemoveXmlRPCHandler("grid_message");
        }
        public void RegionLoaded(Scene scene)
        {
-            
-        }
-        public void PostInitialise()
-        {
            if (m_settings.Configs["Startup"].GetBoolean("gridmode", false))
            {
                m_com = m_scenes[0].CommsManager;
@@ -93,21 +95,8 @@ namespace OpenSim.Region.CoreModules.InterGrid
            }
        }
-        #endregion
+        public void PostInitialise()
-        #region IRegionModule
-        public void Initialise(Scene scene, IConfigSource source)
-        {
-            m_settings = source;
-            lock (m_scenes)
-                m_scenes.Add(scene);
-        }
-        public bool IsSharedModule
        {
-            get { return true; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 10a3232..8bb0fa9 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -35,6 +35,7 @@ using System.Security.Cryptography.X509Certificates;
 using System.Threading;
 using System.Web;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.StructuredData;
@@ -75,8 +76,9 @@ namespace OpenSim.Region.CoreModules.InterGrid
        public bool visible_to_parent;
        public string teleported_into_region;
    }
-    
-    public class OpenGridProtocolModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class OpenGridProtocolModule : ISharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        private List<Scene> m_scene = new List<Scene>();
@@ -92,21 +94,22 @@ namespace OpenSim.Region.CoreModules.InterGrid
        private bool httpSSL = false;
        private uint httpsslport = 0;
        private bool GridMode = false;
+        private bool m_enabled = false;
+        private IConfig cfg = null;
+        private IConfig httpcfg = null;
+        private IConfig startupcfg = null;
+            
+        #region ISharedRegionModule Members
-        #region IRegionModule Members
+        public void Initialise(IConfigSource config)
-        public void Initialise(Scene scene, IConfigSource config)
        {
-            bool enabled = false;
-            IConfig cfg = null;
-            IConfig httpcfg = null;
-            IConfig startupcfg = null;
            try
            {
                cfg = config.Configs["OpenGridProtocol"];
-            } catch (NullReferenceException)
+            } 
+            catch (NullReferenceException)
            {
-                enabled = false;
+                m_enabled = false;
            }
            try
@@ -128,15 +131,15 @@ namespace OpenSim.Region.CoreModules.InterGrid
            if (startupcfg != null)
            {
-                GridMode = enabled = startupcfg.GetBoolean("gridmode", false);
+                GridMode = m_enabled = startupcfg.GetBoolean("gridmode", false);
            }
            if (cfg != null)
            {
-                enabled = cfg.GetBoolean("ogp_enabled", false);
+                m_enabled = cfg.GetBoolean("ogp_enabled", false);
                LastNameSuffix = cfg.GetString("ogp_lastname_suffix", "_EXTERNAL");
                FirstNamePrefix = cfg.GetString("ogp_firstname_prefix", "");
-                if (enabled)
+                if (m_enabled)
                {
                    m_log.Warn("[OGP]: Open Grid Protocol is on, Listening for Clients on /agent/");
                    lock (m_scene)
@@ -165,35 +168,61 @@ namespace OpenSim.Region.CoreModules.InterGrid
                            }
                        }
-                        // can't pick the region 'agent' because it would conflict with our agent domain handler
-                        // a zero length region name would conflict with are base region seed cap
-                        if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0)
-                        {
-                            MainServer.Instance.AddLLSDHandler(
-                                "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),
-                                ProcessRegionDomainSeed);
-                        }
-                        if (!m_scene.Contains(scene))
-                            m_scene.Add(scene);
                    }
                }
            }
-            lock (m_scene)
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
+            if (m_enabled)
            {
-                if (m_scene.Count == 1)
+                lock (m_scene)
                {
-                    if (httpcfg != null)
+                    if (m_scene.Count == 1)
                    {
-                        httpSSL = httpcfg.GetBoolean("http_listener_ssl", false);
+                        if (httpcfg != null)
-                        httpsCN = httpcfg.GetString("http_listener_cn", scene.RegionInfo.ExternalHostName);
+                        {
-                        if (httpsCN.Length == 0)
+                            httpSSL = httpcfg.GetBoolean("http_listener_ssl", false);
-                            httpsCN = scene.RegionInfo.ExternalHostName;
+                            httpsCN = httpcfg.GetString("http_listener_cn", scene.RegionInfo.ExternalHostName);
-                        httpsslport = (uint)httpcfg.GetInt("http_listener_sslport",((int)scene.RegionInfo.HttpPort + 1));
+                            if (httpsCN.Length == 0)
+                                httpsCN = scene.RegionInfo.ExternalHostName;
+                            httpsslport = (uint)httpcfg.GetInt("http_listener_sslport", ((int)scene.RegionInfo.HttpPort + 1));
+                        }
                    }
                }
+                // can't pick the region 'agent' because it would conflict with our agent domain handler
+                // a zero length region name would conflict with are base region seed cap
+                if (!SceneListDuplicateCheck(scene.RegionInfo.RegionName) && scene.RegionInfo.RegionName.ToLower() != "agent" && scene.RegionInfo.RegionName.Length > 0)
+                {
+                    MainServer.Instance.AddLLSDHandler(
+                        "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),
+                        ProcessRegionDomainSeed);
+                }
+                if (!m_scene.Contains(scene))
+                    m_scene.Add(scene);
            }
        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            MainServer.Instance.RemoveLLSDHandler(
+                        "/" + HttpUtility.UrlPathEncode(scene.RegionInfo.RegionName.ToLower()),
+                        ProcessRegionDomainSeed);
+            if (m_scene.Contains(scene))
+                m_scene.Remove(scene);
+        }
        
        public void PostInitialise()
        {
@@ -209,11 +238,6 @@ namespace OpenSim.Region.CoreModules.InterGrid
            get { return "OpenGridProtocolModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        #endregion
        public OSD ProcessRegionDomainSeed(string path, OSD request, string endpoint)
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 679c871..40b7159 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
@@ -40,7 +41,8 @@ using System.Reflection;
 namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
 {
-    public class DynamicTextureModule : IRegionModule, IDynamicTextureManager
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class DynamicTextureModule : ISharedRegionModule, IDynamicTextureManager
    {
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -210,9 +212,14 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
        #endregion
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+            
+        }
+        public void AddRegion(Scene scene)
        {
            if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
            {
@@ -221,6 +228,24 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
            }
        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if (!RegisteredScenes.ContainsKey(scene.RegionInfo.RegionID))
+            {
+                RegisteredScenes.Remove(scene.RegionInfo.RegionID);
+                scene.UnregisterModuleInterface<IDynamicTextureManager>(this);
+            }
+        }
        public void PostInitialise()
        {
        }
@@ -234,11 +259,6 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
            get { return "DynamicTextureModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        #endregion
        #region Nested type: DynamicTextureUpdater
@@ -358,18 +378,18 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
                    // tmptex.DefaultTexture.Fullbright = true;
                    part.UpdateTexture(tmptex);
-                }
+                }
-                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
+                if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
-                {
+                {
-                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
+                    if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
-                    if (oldAsset != null)
+                    if (oldAsset != null)
-                    {
+                    {
-                        if (oldAsset.Temporary == true)
+                        if (oldAsset.Temporary == true)
-                        {
+                        {
-                            scene.AssetService.Delete(oldID.ToString());
+                            scene.AssetService.Delete(oldID.ToString());
-                        }
+                        }
-                    }
+                    }
                }
            }
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
index 83f004d..d6ed468 100644
--- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs
@@ -32,6 +32,7 @@ using System.Text.RegularExpressions;
 using DotNetOpenMail;
 using DotNetOpenMail.SmtpAuth;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -40,6 +41,7 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Scripting.EmailModules
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    public class EmailModule : IEmailModule
    {
        //
@@ -94,7 +96,7 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
            }
        }
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            m_Config = config;
            IConfig SMTPConfig;
@@ -136,7 +138,16 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
                m_Enabled = false;
                return;
            }
+                m_log.Info("[EMAIL] Activated DefaultEmailModule");
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
            // It's a go!
            if (m_Enabled)
            {
@@ -155,8 +166,20 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
                        m_Scenes.Add(scene.RegionInfo.RegionHandle, scene);
                    }
                }
+            }
+        }
-                m_log.Info("[EMAIL] Activated DefaultEmailModule");
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IEmailModule>(this);
+            if (m_Scenes.ContainsKey(scene.RegionInfo.RegionHandle))
+            {
+                m_Scenes.Remove(scene.RegionInfo.RegionHandle);
            }
        }
@@ -173,11 +196,6 @@ namespace OpenSim.Region.CoreModules.Scripting.EmailModules
            get { return "DefaultEmailModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        /// <summary>
        /// Delay function using thread in seconds
        /// </summary>
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
index d78931a..e331b8d 100644
--- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
@@ -31,6 +31,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using System.Threading;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -84,7 +85,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
 {
-    public class HttpRequestModule : IRegionModule, IHttpRequestModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class HttpRequestModule : ISharedRegionModule, IHttpRequestModule
    {
        private object HttpListLock = new object();
        private int httpTimeout = 30000;
@@ -229,18 +231,35 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
        #endregion
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+            m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
+            m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
+            m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
            m_scene.RegisterModuleInterface<IHttpRequestModule>(this);
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
-        m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
+        public void RegionLoaded(Scene scene)
-        m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
+        {
+        }
-            m_pendingRequests = new Dictionary<UUID, HttpRequestClass>();
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IHttpRequestModule>(this);
        }
        public void PostInitialise()
@@ -256,11 +275,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest
            get { return m_name; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        #endregion
    }
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 9b565ed..6ce55a9 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -126,6 +126,8 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
        public void RemoveRegion(Scene scene)
        {
+            scene.UnregisterModuleInterface<IUrlModule>(this);
+            scene.EventManager.OnScriptReset -= OnScriptReset;
        }
        public void Close()
diff --git a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
index c23cea5..35ce2cb 100644
--- a/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LoadImageURL/LoadImageURLModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Drawing;
 using System.IO;
 using System.Net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
@@ -39,7 +40,8 @@ using System.Reflection;
 namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
 {
-    public class LoadImageURLModule : IRegionModule, IDynamicTextureRender
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class LoadImageURLModule : ISharedRegionModule, IDynamicTextureRender
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -97,20 +99,28 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
        #endregion
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
+        {
+            m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
+            m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
+        }
+        public void AddRegion(Scene scene)
        {
            if (m_scene == null)
            {
                m_scene = scene;
            }
-            
-            m_proxyurl = config.Configs["Startup"].GetString("HttpProxy");
-            m_proxyexcepts = config.Configs["Startup"].GetString("HttpProxyExceptions");
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
        {
            m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>();
            if (m_textureManager != null)
@@ -119,18 +129,21 @@ namespace OpenSim.Region.CoreModules.Scripting.LoadImageURL
            }
        }
-        public void Close()
+        public void RemoveRegion(Scene scene)
        {
        }
-        public string Name
+        public void PostInitialise()
        {
-            get { return m_name; }
        }
-        public bool IsSharedModule
+        public void Close()
        {
-            get { return true; }
+        }
+        public string Name
+        {
+            get { return m_name; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
index d57a8e5..71b01a1 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
@@ -31,6 +31,7 @@ using System.Drawing.Imaging;
 using System.Globalization;
 using System.IO;
 using System.Net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
@@ -43,7 +44,8 @@ using System.Reflection;
 namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 {
-    public class VectorRenderModule : IRegionModule, IDynamicTextureRender
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class VectorRenderModule : ISharedRegionModule, IDynamicTextureRender
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -110,15 +112,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
        #endregion
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
-            if (m_scene == null)
-            {
-                m_scene = scene;
-            }
            if (m_graph == null)
            {
                Bitmap bitmap = new Bitmap(1024, 1024, PixelFormat.Format32bppArgb);
@@ -133,7 +130,20 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
            m_log.DebugFormat("[VECTORRENDERMODULE]: using font \"{0}\" for text rendering.", m_fontName);
        }
-        public void PostInitialise()
+        public void AddRegion(Scene scene)
+        {
+            if (m_scene == null)
+            {
+                m_scene = scene;
+            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
        {
            m_textureManager = m_scene.RequestModuleInterface<IDynamicTextureManager>();
            if (m_textureManager != null)
@@ -142,18 +152,21 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
            }
        }
-        public void Close()
+        public void RemoveRegion(Scene scene)
        {
        }
-        public string Name
+        public void PostInitialise()
        {
-            get { return m_name; }
        }
-        public bool IsSharedModule
+        public void Close()
+        {
+        }
+        public string Name
        {
-            get { return true; }
+            get { return m_name; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index 60df2e7..acd8dbf 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -85,7 +86,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Scripting.WorldComm
 {
-    public class WorldCommModule : IRegionModule, IWorldComm
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class WorldCommModule : INonSharedRegionModule, IWorldComm
    {
        // private static readonly ILog m_log =
        //     LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -98,9 +100,9 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
        private int m_saydistance = 30;
        private int m_shoutdistance = 100;
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            // wrap this in a try block so that defaults will work if
            // the config file doesn't specify otherwise.
@@ -120,31 +122,42 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
            if (maxlisteners < 1) maxlisteners = int.MaxValue;
            if (maxhandles < 1) maxhandles = int.MaxValue;
+            m_listenerManager = new ListenerManager(maxlisteners, maxhandles);
+            m_pendingQ = new Queue();
+            m_pending = Queue.Synchronized(m_pendingQ);
+        }
+        public void AddRegion(Scene scene)
+        {
            m_scene = scene;
            m_scene.RegisterModuleInterface<IWorldComm>(this);
-            m_listenerManager = new ListenerManager(maxlisteners, maxhandles);
            m_scene.EventManager.OnChatFromClient += DeliverClientMessage;
            m_scene.EventManager.OnChatBroadcast += DeliverClientMessage;
-            m_pendingQ = new Queue();
-            m_pending = Queue.Synchronized(m_pendingQ);
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
        {
+            get { return null; }
        }
-        public void Close()
+        public void RegionLoaded(Scene scene)
        {
        }
-        public string Name
+        public void RemoveRegion(Scene scene)
        {
-            get { return "WorldCommModule"; }
+            scene.UnregisterModuleInterface<IWorldComm>(this);
+            scene.EventManager.OnChatFromClient -= DeliverClientMessage;
+            scene.EventManager.OnChatBroadcast -= DeliverClientMessage;
        }
-        public bool IsSharedModule
+        public void Close()
        {
-            get { return false; }
+        }
+        public string Name
+        {
+            get { return "WorldCommModule"; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 27b64bf..a9147fb6 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -32,6 +32,7 @@ using System.Net;
 using System.Reflection;
 using System.Threading;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using Nwc.XmlRpc;
 using OpenMetaverse;
@@ -76,7 +77,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
 {
-    public class XMLRPCModule : IRegionModule, IXMLRPC
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class XMLRPCModule : ISharedRegionModule, IXMLRPC
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -94,9 +96,9 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
        private int RemoteReplyScriptWait = 300;
        private object XMLRPCListLock = new object();
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            // We need to create these early because the scripts might be calling
            // But since this gets called for every region, we need to make sure they
@@ -116,7 +118,14 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
                {
                }
            }
+        }
+        public void PostInitialise()
+        {
+        }
+        public void AddRegion(Scene scene)
+        {
            if (!m_scenes.Contains(scene))
            {
                m_scenes.Add(scene);
@@ -125,7 +134,12 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
            }
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        private Dictionary<Scene, BaseHttpServer> m_HttpServers = new Dictionary<Scene, BaseHttpServer>();
+        public void RegionLoaded(Scene scene)
        {
            if (IsEnabled())
            {
@@ -133,24 +147,41 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
                // Attach xmlrpc handlers
                m_log.Info("[REMOTE_DATA]: " +
                           "Starting XMLRPC Server on port " + m_remoteDataPort + " for llRemoteData commands.");
-                BaseHttpServer httpServer = new BaseHttpServer((uint) m_remoteDataPort);
+                BaseHttpServer httpServer = new BaseHttpServer((uint)m_remoteDataPort);
                httpServer.AddXmlRPCHandler("llRemoteData", XmlRpcRemoteData);
                httpServer.Start();
+                m_HttpServers.Add(scene, httpServer);
            }
        }
-        public void Close()
+        public void RemoveRegion(Scene scene)
        {
+            if (m_scenes.Contains(scene))
+                m_scenes.Remove(scene);
+            scene.UnregisterModuleInterface<IXMLRPC>(this);
+            if (IsEnabled())
+            {
+                // Start http server
+                // Attach xmlrpc handlers
+                if (m_HttpServers.ContainsKey(scene))
+                {
+                    BaseHttpServer httpServer;
+                    m_HttpServers.TryGetValue(scene, out httpServer);
+                    m_log.Info("[REMOTE_DATA]: " +
+                               "Stopping XMLRPC Server on port " + m_remoteDataPort + " for llRemoteData commands.");
+                    httpServer.RemoveXmlRPCHandler("llRemoteData");
+                    httpServer.Stop();
+                }
+            }
        }
-        public string Name
+        public void Close()
        {
-            get { return m_name; }
        }
-        public bool IsSharedModule
+        public string Name
        {
-            get { return true; }
+            get { return m_name; }
        }
        public int Port
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 879cc70..d3e2db7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
        private IConfigSource m_Config;
        bool m_Registered = false;
-        #region IRegionModule interface
+        #region ISharedRegionModule interface
        public void Initialise(IConfigSource config)
        {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
index b12d778..a895a3f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
        bool m_Registered = false;
        HypergridServiceInConnector m_HypergridHandler;
-        #region IRegionModule interface
+        #region ISharedRegionModule interface
        public void Initialise(IConfigSource config)
        {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 54c6d89..4c74725 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
        private IConfigSource m_Config;
        bool m_Registered = false;
-        #region IRegionModule interface
+        #region ISharedRegionModule interface
        public void Initialise(IConfigSource config)
        {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
index bce160a..dcc6dec 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Land/LandServiceInConnectorModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Land
        private IConfigSource m_Config;
        private List<Scene> m_Scenes = new List<Scene>();
-        #region IRegionModule interface
+        #region ISharedRegionModule interface
        public void Initialise(IConfigSource config)
        {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
index 8a90370..a5c5ef6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour
        private IConfigSource m_Config;
        private List<Scene> m_Scenes = new List<Scene>();
-        #region IRegionModule interface
+        #region ISharedRegionModule interface
        public void Initialise(IConfigSource config)
        {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index f28a318..c2cea16 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
        private IConfigSource m_Config;
        bool m_Registered = false;
-        #region IRegionModule interface
+        #region ISharedRegionModule interface
        public void Initialise(IConfigSource config)
        {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
index d68c683..71d7993 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -48,7 +48,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
        #endregion /* Events */
-        #region IRegionModule
+        #region ISharedRegionModule
        public void Initialise(IConfigSource config)
        {
@@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
            }
        }
-        #endregion /* IRegionModule */
+        #endregion
        #region IInterregionComms
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
index 44458d1..24d35e1 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
@@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
        protected bool m_safemode;
        protected IPAddress m_thisIP;
-        #region IRegionModule
+        #region ISharedRegionModule
        public virtual void Initialise(IConfigSource config)
        {
@@ -149,7 +149,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
            MainServer.Instance.AddHTTPHandler("/object/", ObjectHandler);
        }
-        #endregion /* IRegionModule */
+        #endregion
        #region IInterregionComms
@@ -436,12 +436,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
            }
            OSDMap resp = new OSDMap(2);
-            string reason = String.Empty;
+            string reason = String.Empty;
-            uint teleportFlags = 0;
+            uint teleportFlags = 0;
-            if (args.ContainsKey("teleport_flags"))
+            if (args.ContainsKey("teleport_flags"))
-            {
+            {
-                teleportFlags = args["teleport_flags"].AsUInteger();
+                teleportFlags = args["teleport_flags"].AsUInteger();
-            }
+            }
            
            // This is the meaning of POST agent
            m_regionClient.AdjustUserInformation(aCircuit);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
index fc8d4e1..c738b65 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
@@ -81,6 +81,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
        public void RemoveRegion(Scene scene)
        {
+            scene.UnregisterModuleInterface<IRegionArchiverModule>(this);
        }
        public void Close()
diff --git a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
index 5fa3dc2..a2cfce6 100644
--- a/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
+++ b/OpenSim/Region/CoreModules/World/Cloud/CloudModule.cs
@@ -27,6 +27,7 @@
 using System;
 using System.Collections.Generic;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -35,6 +36,7 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    public class CloudModule : ICloudModule
    {
 //        private static readonly log4net.ILog m_log 
@@ -48,7 +50,7 @@ namespace OpenSim.Region.CoreModules
        private float m_cloudDensity = 1.0F;
        private float[] cloudCover = new float[16 * 16];
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
            IConfig cloudConfig = config.Configs["Cloud"];
@@ -58,10 +60,17 @@ namespace OpenSim.Region.CoreModules
                m_cloudDensity = cloudConfig.GetFloat("density", 0.5F);
                m_frameUpdateRate = cloudConfig.GetInt("cloud_update_rate", 1000);
            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
            if (m_enabled)
            {
                m_scene = scene;
                scene.EventManager.OnNewClient += CloudsToClient;
@@ -71,9 +80,18 @@ namespace OpenSim.Region.CoreModules
                GenerateCloudCover();
                m_ready = true;
            }
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.EventManager.OnNewClient -= CloudsToClient;
+            scene.UnregisterModuleInterface<ICloudModule>(this);
+            scene.EventManager.OnFrame -= CloudUpdate;
        }
        public void PostInitialise()
@@ -96,12 +114,6 @@ namespace OpenSim.Region.CoreModules
            get { return "CloudModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        public float CloudCover(int x, int y, int z)
        {
            float cover = 0f;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 695cced..39836ae 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -30,6 +30,7 @@ using System.IO;
 using System.Reflection;
 using System.Security;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,6 +39,7 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Estate
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    public class EstateManagementModule : IEstateModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -898,7 +900,16 @@ namespace OpenSim.Region.CoreModules.World.Estate
        #region IRegionModule Members
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
            m_scene.RegisterModuleInterface<IEstateModule>(this);
@@ -920,6 +931,29 @@ namespace OpenSim.Region.CoreModules.World.Estate
                               consoleSetTerrainHeights);
        }
+        public void RegionLoaded(Scene scene)
+        {
+            // Sets up the sun module based on the saved Estate and Region Settings
+            // DO NOT REMOVE or the sun will stop working
+            TriggerEstateToolsSunUpdate();
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IEstateModule>(this);
+            scene.EventManager.OnNewClient -= EventManager_OnNewClient;
+            scene.EventManager.OnRequestChangeWaterHeight -= changeWaterHeight;
+        }
+        public void Close()
+        {
+        }
+        public string Name
+        {
+            get { return "EstateManagementModule"; }
+        }
        #region Console Commands
        public void consoleSetTerrainTexture(string module, string[] args)
@@ -1006,28 +1040,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
        }
        #endregion
-        public void PostInitialise()
-        {
-            // Sets up the sun module based no the saved Estate and Region Settings
-            // DO NOT REMOVE or the sun will stop working
-            TriggerEstateToolsSunUpdate();
-        }
-        public void Close()
-        {
-        }
-        public string Name
-        {
-            get { return "EstateManagementModule"; }
-        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        #endregion
        #region Other Functions
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index f66f01f..68e8485 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -89,7 +90,8 @@ enum GroupPowers : long
 namespace OpenSim.Region.CoreModules.World.Permissions
 {
-    public class PermissionsModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class PermissionsModule : INonSharedRegionModule
    {
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
                
@@ -148,12 +150,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
        #endregion
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
-            m_scene = scene;
            IConfig myConfig = config.Configs["Startup"];
            string permissionModules = myConfig.GetString("permissionmodules", "DefaultPermissionsModule");
@@ -177,7 +177,57 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            if (m_bypassPermissions)
                m_log.Info("[PERMISSIONS]: serviceside_object_permissions = false in ini file so disabling all region service permission checks");
            else
-                m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks");
+                m_log.Debug("[PERMISSIONS]: Enabling all region service permission checks");     
+                    
+            string grant = myConfig.GetString("GrantLSL","");
+            if (grant.Length > 0) {
+                foreach (string uuidl in grant.Split(',')) {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantLSL.Add(uuid, true);
+                }
+            }
+            grant = myConfig.GetString("GrantCS","");
+            if (grant.Length > 0) {
+                foreach (string uuidl in grant.Split(',')) {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantCS.Add(uuid, true);
+                }
+            }
+            grant = myConfig.GetString("GrantVB","");
+            if (grant.Length > 0) {
+                foreach (string uuidl in grant.Split(',')) {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantVB.Add(uuid, true);
+                }
+            }
+            grant = myConfig.GetString("GrantJS", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantJS.Add(uuid, true);
+                }
+            }
+            grant = myConfig.GetString("GrantYP", "");
+            if (grant.Length > 0)
+            {
+                foreach (string uuidl in grant.Split(','))
+                {
+                    string uuid = uuidl.Trim(" \t".ToCharArray());
+                    GrantYP.Add(uuid, true);
+                }
+            }
+        }
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
            //Register functions with Scene External Checks!
            m_scene.Permissions.OnBypassPermissions += BypassPermissions;
@@ -210,23 +260,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
            m_scene.Permissions.OnLinkObject += CanLinkObject; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnDelinkObject += CanDelinkObject; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED
-            
            m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED
-            
            m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory; //NOT IMPLEMENTED HERE 
            m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
            m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnResetScript += CanResetScript;
-            
            m_scene.Permissions.OnCreateUserInventory += CanCreateUserInventory; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnCopyUserInventory += CanCopyUserInventory; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnEditUserInventory += CanEditUserInventory; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnDeleteUserInventory += CanDeleteUserInventory; //NOT YET IMPLEMENTED
-            
            m_scene.Permissions.OnTeleport += CanTeleport; //NOT YET IMPLEMENTED
            m_scene.Permissions.OnUseObjectReturn += CanUseObjectReturn; //NOT YET IMPLEMENTED
@@ -244,52 +294,87 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                    "debug permissions <true / false>",
                    "Enable permissions debugging",
                    HandleDebugPermissions);
-                    
+        }
-                    
-            string grant = myConfig.GetString("GrantLSL","");
-            if (grant.Length > 0) {
-                foreach (string uuidl in grant.Split(',')) {
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantLSL.Add(uuid, true);
-                }
-            }
-            grant = myConfig.GetString("GrantCS","");
+        public Type ReplaceableInterface
-            if (grant.Length > 0) {
+        {
-                foreach (string uuidl in grant.Split(',')) {
+            get { return null; }
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
+        }
-                    GrantCS.Add(uuid, true);
-                }
-            }
-            grant = myConfig.GetString("GrantVB","");
+        public void RegionLoaded(Scene scene)
-            if (grant.Length > 0) {
+        {
-                foreach (string uuidl in grant.Split(',')) {
+            m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantVB.Add(uuid, true);
-                }
-            }
-            grant = myConfig.GetString("GrantJS", "");
+            if (m_friendsModule == null)
-            if (grant.Length > 0)
+                m_log.Error("[PERMISSIONS]: Friends module not found, friend permissions will not work");
-            {
+            else
-                foreach (string uuidl in grant.Split(','))
+                m_log.Info("[PERMISSIONS]: Friends module found, friend permissions enabled");
-                {
+        }
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
-                    GrantJS.Add(uuid, true);
-                }
-            }
-            grant = myConfig.GetString("GrantYP", "");
+        public void RemoveRegion(Scene scene)
-            if (grant.Length > 0)
+        {
-            {
+            scene.Permissions.OnBypassPermissions -= BypassPermissions;
-                foreach (string uuidl in grant.Split(','))
+            scene.Permissions.OnSetBypassPermissions -= SetBypassPermissions;
-                {
+            scene.Permissions.OnPropagatePermissions -= PropagatePermissions;
-                    string uuid = uuidl.Trim(" \t".ToCharArray());
+            scene.Permissions.OnGenerateClientFlags -= GenerateClientFlags;
-                    GrantYP.Add(uuid, true);
+            scene.Permissions.OnAbandonParcel -= CanAbandonParcel;
-                }
+            scene.Permissions.OnReclaimParcel -= CanReclaimParcel;
-            }
+            scene.Permissions.OnDeedParcel -= CanDeedParcel;
+            scene.Permissions.OnDeedObject -= CanDeedObject;
+            scene.Permissions.OnIsGod -= IsGod;
+            scene.Permissions.OnDuplicateObject -= CanDuplicateObject;
+            scene.Permissions.OnDeleteObject -= CanDeleteObject; //MAYBE FULLY IMPLEMENTED
+            scene.Permissions.OnEditObject -= CanEditObject; //MAYBE FULLY IMPLEMENTED
+            scene.Permissions.OnEditParcel -= CanEditParcel; //MAYBE FULLY IMPLEMENTED
+            scene.Permissions.OnInstantMessage -= CanInstantMessage;
+            scene.Permissions.OnInventoryTransfer -= CanInventoryTransfer; //NOT YET IMPLEMENTED
+            scene.Permissions.OnIssueEstateCommand -= CanIssueEstateCommand; //FULLY IMPLEMENTED
+            scene.Permissions.OnMoveObject -= CanMoveObject; //MAYBE FULLY IMPLEMENTED
+            scene.Permissions.OnObjectEntry -= CanObjectEntry;
+            scene.Permissions.OnReturnObject -= CanReturnObject; //NOT YET IMPLEMENTED
+            scene.Permissions.OnRezObject -= CanRezObject; //MAYBE FULLY IMPLEMENTED
+            scene.Permissions.OnRunConsoleCommand -= CanRunConsoleCommand;
+            scene.Permissions.OnRunScript -= CanRunScript; //NOT YET IMPLEMENTED
+            scene.Permissions.OnCompileScript -= CanCompileScript;
+            scene.Permissions.OnSellParcel -= CanSellParcel;
+            scene.Permissions.OnTakeObject -= CanTakeObject;
+            scene.Permissions.OnTakeCopyObject -= CanTakeCopyObject;
+            scene.Permissions.OnTerraformLand -= CanTerraformLand;
+            scene.Permissions.OnLinkObject -= CanLinkObject; //NOT YET IMPLEMENTED
+            scene.Permissions.OnDelinkObject -= CanDelinkObject; //NOT YET IMPLEMENTED
+            scene.Permissions.OnBuyLand -= CanBuyLand; //NOT YET IMPLEMENTED
+            scene.Permissions.OnViewNotecard -= CanViewNotecard; //NOT YET IMPLEMENTED
+            scene.Permissions.OnViewScript -= CanViewScript; //NOT YET IMPLEMENTED
+            scene.Permissions.OnEditNotecard -= CanEditNotecard; //NOT YET IMPLEMENTED
+            scene.Permissions.OnEditScript -= CanEditScript; //NOT YET IMPLEMENTED
+            scene.Permissions.OnCreateObjectInventory -= CanCreateObjectInventory; //NOT IMPLEMENTED HERE 
+            scene.Permissions.OnEditObjectInventory -= CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED
+            scene.Permissions.OnCopyObjectInventory -= CanCopyObjectInventory; //NOT YET IMPLEMENTED
+            scene.Permissions.OnDeleteObjectInventory -= CanDeleteObjectInventory; //NOT YET IMPLEMENTED
+            scene.Permissions.OnResetScript -= CanResetScript;
+            scene.Permissions.OnCreateUserInventory -= CanCreateUserInventory; //NOT YET IMPLEMENTED
+            scene.Permissions.OnCopyUserInventory -= CanCopyUserInventory; //NOT YET IMPLEMENTED
+            scene.Permissions.OnEditUserInventory -= CanEditUserInventory; //NOT YET IMPLEMENTED
+            scene.Permissions.OnDeleteUserInventory -= CanDeleteUserInventory; //NOT YET IMPLEMENTED
+            scene.Permissions.OnTeleport -= CanTeleport; //NOT YET IMPLEMENTED
+            scene.Permissions.OnUseObjectReturn -= CanUseObjectReturn; //NOT YET IMPLEMENTED
+        }
+        public void PostInitialise()
+        {
+        }
+        public void Close()
+        {
+        }
+        public string Name
+        {
+            get { return "PermissionsModule"; }
        }
        public void HandleBypassPermissions(string module, string[] args)
@@ -362,31 +447,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
                m_log.InfoFormat("[PERMISSIONS] Set permissions debugging to {0} in {1}", m_debugPermissions, m_scene.RegionInfo.RegionName);
            }
        }
-        public void PostInitialise()
-        {
-            m_friendsModule = m_scene.RequestModuleInterface<IFriendsModule>();
-            if (m_friendsModule == null)
-                m_log.Error("[PERMISSIONS]: Friends module not found, friend permissions will not work");
-            else
-                m_log.Info("[PERMISSIONS]: Friends module found, friend permissions enabled");
-        }
-        public void Close()
-        {
-        }
-        public string Name
-        {
-            get { return "PermissionsModule"; }
-        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        #endregion
        #region Helper Functions
diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
index 37f1f2e..ed7bfe1 100644
--- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs
@@ -26,6 +26,7 @@
 */
 using System;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -34,26 +35,44 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.World.Sound
 {
-    public class SoundModule : IRegionModule, ISoundModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class SoundModule : INonSharedRegionModule, ISoundModule
    {
        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
        protected Scene m_scene;
        
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
-            
            m_scene.EventManager.OnNewClient += OnNewClient;
-            
            m_scene.RegisterModuleInterface<ISoundModule>(this);
        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.EventManager.OnNewClient -= OnNewClient;
+            scene.UnregisterModuleInterface<ISoundModule>(this);
+        }
        
-        public void PostInitialise() {}
        public void Close() {}
        public string Name { get { return "Sound Module"; } }
-        public bool IsSharedModule { get { return false; } }
+         
-        
        private void OnNewClient(IClientAPI client)
        {
            client.OnSoundTrigger += TriggerSound;
diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
index 0712a7f..948c47c 100644
--- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs
@@ -29,6 +29,7 @@ using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -37,6 +38,7 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules
 {
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
    public class SunModule : ISunModule
    {
        /// <summary>
@@ -278,27 +280,12 @@ namespace OpenSim.Region.CoreModules
            return GetCurrentSunHour() + 6.0f;
        }
-        #region IRegion Methods
+        #region INonSharedRegionModule Methods
        // Called immediately after the module is loaded for a given region
        // i.e. Immediately after instance creation.
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
-            m_scene = scene;
-            m_frame = 0;
-            // This one puts an entry in the main help screen
-            m_scene.AddCommand(this, String.Empty, "sun", "Usage: sun [param] [value] - Get or Update Sun module paramater", null);
-            // This one enables the ability to type just "sun" without any parameters
-            m_scene.AddCommand(this, "sun", "", "", HandleSunConsoleCommand);
-            foreach (KeyValuePair<string, string> kvp in GetParamList())
-            {
-                m_scene.AddCommand(this, String.Format("sun {0}", kvp.Key), String.Format("{0} - {1}", kvp.Key, kvp.Value), "", HandleSunConsoleCommand);
-            }
            TimeZone local = TimeZone.CurrentTimeZone;
            TicksUTCOffset = local.GetUtcOffset(local.ToLocalTime(DateTime.Now)).Ticks;
            m_log.Debug("[SUN]: localtime offset is " + TicksUTCOffset);
@@ -346,7 +333,43 @@ namespace OpenSim.Region.CoreModules
                // m_latitude    = d_latitude;
                // m_longitude   = d_longitude;
            }
+        }
+        public void Close()
+        {
+            ready = false;
+            
+            // Remove our hooks
+            m_scene.EventManager.OnFrame     -= SunUpdate;
+            m_scene.EventManager.OnAvatarEnteringNewParcel -= AvatarEnteringParcel;
+            m_scene.EventManager.OnEstateToolsSunUpdate -= EstateToolsSunUpdate;
+            m_scene.EventManager.OnGetCurrentTimeAsLindenSunHour -= GetCurrentTimeAsLindenSunHour;
+        }
+        public string Name
+        {
+            get { return "SunModule"; }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
+            m_frame = 0;
+            // This one puts an entry in the main help screen
+            m_scene.AddCommand(this, String.Empty, "sun", "Usage: sun [param] [value] - Get or Update Sun module paramater", null);
+            // This one enables the ability to type just "sun" without any parameters
+            m_scene.AddCommand(this, "sun", "", "", HandleSunConsoleCommand);
+            foreach (KeyValuePair<string, string> kvp in GetParamList())
+            {
+                m_scene.AddCommand(this, String.Format("sun {0}", kvp.Key), String.Format("{0} - {1}", kvp.Key, kvp.Value), "", HandleSunConsoleCommand);
+            }
            switch (m_RegionMode)
            {
                case "T1":
@@ -354,8 +377,8 @@ namespace OpenSim.Region.CoreModules
                case "SL":
                    // Time taken to complete a cycle (day and season)
-                    SecondsPerSunCycle = (uint) (m_DayLengthHours * 60 * 60);
+                    SecondsPerSunCycle = (uint)(m_DayLengthHours * 60 * 60);
-                    SecondsPerYear     = (uint) (SecondsPerSunCycle*m_YearLengthDays);
+                    SecondsPerYear = (uint)(SecondsPerSunCycle * m_YearLengthDays);
                    // Ration of real-to-virtual time
@@ -364,17 +387,17 @@ namespace OpenSim.Region.CoreModules
                    // Speed of rotation needed to complete a cycle in the
                    // designated period (day and season)
-                    SunSpeed           = m_SunCycle/SecondsPerSunCycle;
+                    SunSpeed = m_SunCycle / SecondsPerSunCycle;
-                    SeasonSpeed        = m_SeasonalCycle/SecondsPerYear;
+                    SeasonSpeed = m_SeasonalCycle / SecondsPerYear;
                    // Horizon translation
-                    HorizonShift      = m_HorizonShift; // Z axis translation
+                    HorizonShift = m_HorizonShift; // Z axis translation
                    // HoursToRadians    = (SunCycle/24)*VWTimeRatio;
                    //  Insert our event handling hooks
-                    scene.EventManager.OnFrame     += SunUpdate;
+                    scene.EventManager.OnFrame += SunUpdate;
                    scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
                    scene.EventManager.OnEstateToolsSunUpdate += EstateToolsSunUpdate;
                    scene.EventManager.OnGetCurrentTimeAsLindenSunHour += GetCurrentTimeAsLindenSunHour;
@@ -391,34 +414,21 @@ namespace OpenSim.Region.CoreModules
            }
            scene.RegisterModuleInterface<ISunModule>(this);
        }
+        public void RegionLoaded(Scene scene)
-        public void PostInitialise()
        {
        }
-        public void Close()
+        public void RemoveRegion(Scene scene)
-        {
-            ready = false;
-            
-            // Remove our hooks
-            m_scene.EventManager.OnFrame     -= SunUpdate;
-            m_scene.EventManager.OnAvatarEnteringNewParcel -= AvatarEnteringParcel;
-            m_scene.EventManager.OnEstateToolsSunUpdate -= EstateToolsSunUpdate;
-            m_scene.EventManager.OnGetCurrentTimeAsLindenSunHour -= GetCurrentTimeAsLindenSunHour;
-        }
-        public string Name
        {
-            get { return "SunModule"; }
+            scene.RegisterModuleInterface<ISunModule>(this);
+            scene.EventManager.OnFrame -= SunUpdate;
+            scene.EventManager.OnAvatarEnteringNewParcel -= AvatarEnteringParcel;
+            scene.EventManager.OnEstateToolsSunUpdate -= EstateToolsSunUpdate;
+            scene.EventManager.OnGetCurrentTimeAsLindenSunHour -= GetCurrentTimeAsLindenSunHour;
        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        #endregion
        #region EventManager Events
diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
index c2ad7b8..0b487ed 100644
--- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
+++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -36,7 +37,8 @@ using OpenSim.Region.Framework.Scenes;
 namespace OpenSim.Region.CoreModules.Avatar.Vegetation
 {
-    public class VegetationModule : IRegionModule, IVegetationModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class VegetationModule : INonSharedRegionModule, IVegetationModule
    { 
        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
        
@@ -45,17 +47,34 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation
        protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree };
        public PCode[] CreationCapabilities { get { return creationCapabilities; } }
        
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public void AddRegion(Scene scene)
        {
            m_scene = scene;
            m_scene.RegisterModuleInterface<IVegetationModule>(this);
        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            scene.UnregisterModuleInterface<IVegetationModule>(this);
+        }
        
        public void PostInitialise() {}
        public void Close() {}
        public string Name { get { return "Vegetation Module"; } }
-        public bool IsSharedModule { get { return false; } }
+        
        public SceneObjectGroup AddTree(
            UUID uuid, UUID groupID, Vector3 scale, Quaternion rotation, Vector3 position, Tree treeType, bool newTree)
        {
diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
index 3283c1f..cd3706d 100644
--- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
+++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs
@@ -55,17 +55,19 @@ namespace OpenSim.Region.CoreModules
        private IWindModelPlugin m_activeWindPlugin = null;
        private const string m_dWindPluginName = "SimpleRandomWind";
+        private string m_desiredWindPlugin = "SimpleRandomWind";
        private Dictionary<string, IWindModelPlugin> m_availableWindPlugins = new Dictionary<string, IWindModelPlugin>();
        // Simplified windSpeeds based on the fact that the client protocal tracks at a resolution of 16m
        private Vector2[] windSpeeds = new Vector2[16 * 16];
+        private IConfig windConfig;
        #region IRegion Methods
-        public void Initialise(Scene scene, IConfigSource config)
+        public void Initialise(IConfigSource config)
        {
-            IConfig windConfig = config.Configs["Wind"];
+            windConfig = config.Configs["Wind"];
-            string desiredWindPlugin = m_dWindPluginName;
+            m_desiredWindPlugin = m_dWindPluginName;
            if (windConfig != null)
            {
@@ -76,10 +78,18 @@ namespace OpenSim.Region.CoreModules
                // Determine which wind model plugin is desired
                if (windConfig.Contains("wind_plugin"))
                {
-                    desiredWindPlugin = windConfig.GetString("wind_plugin");
+                    m_desiredWindPlugin = windConfig.GetString("wind_plugin");
                }
            }
+        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void AddRegion(Scene scene)
+        {
            if (m_enabled)
            {
                m_log.InfoFormat("[WIND] Enabled with an update rate of {0} frames.", m_frameUpdateRate);
@@ -95,30 +105,30 @@ namespace OpenSim.Region.CoreModules
                }
                // Check for desired plugin
-                if (m_availableWindPlugins.ContainsKey(desiredWindPlugin))
+                if (m_availableWindPlugins.ContainsKey(m_desiredWindPlugin))
                {
-                    m_activeWindPlugin = m_availableWindPlugins[desiredWindPlugin];
+                    m_activeWindPlugin = m_availableWindPlugins[m_desiredWindPlugin];
-                    m_log.InfoFormat("[WIND] {0} plugin found, initializing.", desiredWindPlugin);
+                    m_log.InfoFormat("[WIND] {0} plugin found, initializing.", m_desiredWindPlugin);
                    if (windConfig != null)
                    {
                        m_activeWindPlugin.Initialise();
                        m_activeWindPlugin.WindConfig(m_scene, windConfig);
                    }
-                } 
+                }
                // if the plug-in wasn't found, default to no wind.
                if (m_activeWindPlugin == null)
                {
-                    m_log.ErrorFormat("[WIND] Could not find specified wind plug-in: {0}", desiredWindPlugin);
+                    m_log.ErrorFormat("[WIND] Could not find specified wind plug-in: {0}", m_desiredWindPlugin);
                    m_log.ErrorFormat("[WIND] Defaulting to no wind.");
                }
                // This one puts an entry in the main help screen
                m_scene.AddCommand(this, String.Empty, "wind", "Usage: wind <plugin> <param> [value] - Get or Update Wind paramaters", null);
-                
                // This one enables the ability to type just the base command without any parameters
                m_scene.AddCommand(this, "wind", "", "", HandleConsoleCommand);
@@ -127,7 +137,7 @@ namespace OpenSim.Region.CoreModules
                {
                    m_scene.AddCommand(this, String.Format("wind base wind_plugin {0}", windPlugin.Name), String.Format("{0} - {1}", windPlugin.Name, windPlugin.Description), "", HandleConsoleBaseCommand);
                    m_scene.AddCommand(this, String.Format("wind base wind_update_rate"), "Change the wind update rate.", "", HandleConsoleBaseCommand);
-                    
                    foreach (KeyValuePair<string, string> kvp in windPlugin.WindParams())
                    {
                        m_scene.AddCommand(this, String.Format("wind {0} {1}", windPlugin.Name, kvp.Key), String.Format("{0} : {1} - {2}", windPlugin.Name, kvp.Key, kvp.Value), "", HandleConsoleParamCommand);
@@ -149,11 +159,17 @@ namespace OpenSim.Region.CoreModules
                m_ready = true;
            }
+        }
+        public void RegionLoaded(Scene scene)
+        {
        }
-        public void PostInitialise()
+        public void RemoveRegion(Scene scene)
        {
+            scene.EventManager.OnFrame -= WindUpdate;
+            scene.EventManager.OnMakeRootAgent -= OnAgentEnteredRegion;
+            scene.UnregisterModuleInterface<IWindModule>(this);
        }
        public void Close()
@@ -182,11 +198,6 @@ namespace OpenSim.Region.CoreModules
            get { return "WindModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return false; }
-        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
index 285d36a..6bda1e9 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapImageModule.cs
@@ -30,6 +30,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
@@ -59,7 +60,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        public face[] trns;
    }
-    public class MapImageModule : IMapImageGenerator, IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class MapImageModule : IMapImageGenerator, INonSharedRegionModule
    {
        private static readonly ILog m_log =
            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -128,37 +130,45 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        #endregion
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
        {
-            m_scene = scene;
            m_config = source;
            IConfig startupConfig = m_config.Configs["Startup"];
            if (startupConfig.GetString("MapImageModule", "MapImageModule") !=
                    "MapImageModule")
                return;
+        }
+        public void AddRegion(Scene scene)
+        {
+            m_scene = scene;
            m_scene.RegisterModuleInterface<IMapImageGenerator>(this);
        }
-        public void PostInitialise()
+        public Type ReplaceableInterface
        {
+            get { return null; }
        }
-        public void Close()
+        public void RegionLoaded(Scene scene)
        {
        }
-        public string Name
+        public void RemoveRegion(Scene scene)
        {
-            get { return "MapImageModule"; }
+            scene.UnregisterModuleInterface<IMapImageGenerator>(this);
        }
-        public bool IsSharedModule
+        public void Close()
+        {
+        }
+        public string Name
        {
-            get { return false; }
+            get { return "MapImageModule"; }
        }
        #endregion
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index be46fa5..dd33673 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -24,9 +24,12 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+using System;
 using System.Collections.Generic;
 using System.Reflection;
 using log4net;
+using Mono.Addins;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
@@ -38,7 +41,8 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
 namespace OpenSim.Region.CoreModules.World.WorldMap
 {
-    public class MapSearchModule : IRegionModule
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
+    public class MapSearchModule : ISharedRegionModule
    {
        private static readonly ILog m_log =
            LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -46,8 +50,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
        Scene m_scene = null; // only need one for communication with GridService
        List<Scene> m_scenes = new List<Scene>();
-        #region IRegionModule Members
+        #region ISharedRegionModule Members
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+        public void AddRegion(Scene scene)
        {
            if (m_scene == null)
            {
@@ -58,6 +66,22 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            scene.EventManager.OnNewClient += OnNewClient;
        }
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+        public void RegionLoaded(Scene scene)
+        {
+        }
+        public void RemoveRegion(Scene scene)
+        {
+            if(m_scenes.Contains(scene))
+                m_scenes.Remove(scene);
+            scene.EventManager.OnNewClient -= OnNewClient;
+        }
        public void PostInitialise()
        {
        }
@@ -73,11 +97,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
            get { return "MapSearchModule"; }
        }
-        public bool IsSharedModule
-        {
-            get { return true; }
-        }
        #endregion
        private void OnNewClient(IClientAPI client)