Merge branch 'master' into connector_plugin

Conflicts:
	OpenSim/Server/Base/ServicesServerBase.cs

4 files changed, 97 insertions, 35 deletions

diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
index 73d1f72..e973652 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetTransactionModule.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
         private Dictionary<UUID, AgentAssetTransactions> AgentTransactions =
             new Dictionary<UUID, AgentAssetTransactions>();
         
-        #region IRegionModule Members
+        #region Region Module interface
 
         public void Initialise(IConfigSource source)
         {
diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs b/OpenSim/Region/CoreModules/Agent/IPBan/IPBanModule.cs
index bfe2a71..4b457b1 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,13 +37,18 @@ using OpenSim.Region.Framework.Scenes;
 
 namespace OpenSim.Region.CoreModules.Agent.IPBan
 {
-    public class IPBanModule : IRegionModule 
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "IPBanModule")]
+    public class IPBanModule : ISharedRegionModule 
     {
-        #region Implementation of IRegionModule
+        #region Implementation of ISharedRegionModule
 
         private List<string> m_bans = new List<string>();
 
-        public void Initialise(Scene scene, IConfigSource source)
+        public void Initialise(IConfigSource source)
+        {
+        }
+
+        public void AddRegion(Scene scene)
         {
             new SceneBanner(scene, m_bans);
 
@@ -50,7 +56,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             {
                 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,6 +64,14 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             }
         }
 
+        public void RemoveRegion(Scene scene)
+        {
+        }
+
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
         public void PostInitialise()
         {
             if (File.Exists("bans.txt"))
@@ -80,9 +94,9 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan
             get { return "IPBanModule"; }
         }
 
-        public bool IsSharedModule
+        public Type ReplaceableInterface
         {
-            get { return true; }
+            get { return null; }
         }
 
         #endregion
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index a1a2501..3764685 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", Id = "J2KDecoderModule")]
+    public class J2KDecoderModule : ISharedRegionModule, IJ2KDecoder
     {
         private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
@@ -55,27 +57,32 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         private readonly Dictionary<UUID, List<DecodedCallback>> m_notifyList = new Dictionary<UUID, List<DecodedCallback>>();
         /// <summary>Cache that will store decoded JPEG2000 layer boundary data</summary>
         private IImprovedAssetCache m_cache;
+        private IImprovedAssetCache Cache
+        {
+            get
+            {
+                if (m_cache == null)
+                    m_cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
+
+                return m_cache;
+            }
+        }
         /// <summary>Reference to a scene (doesn't matter which one as long as it can load the cache module)</summary>
+        private UUID m_CreatorID = UUID.Zero;
         private Scene m_scene;
 
-        #region IRegionModule
+        #region ISharedRegionModule
 
         private bool m_useCSJ2K = true;
 
         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)
         {
-            if (m_scene == null)
-                m_scene = scene;
-
-            scene.RegisterModuleInterface<IJ2KDecoder>(this);
-
             IConfig startupConfig = source.Configs["Startup"];
             if (startupConfig != null)
             {
@@ -83,16 +90,42 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
             }
         }
 
+        public void AddRegion(Scene scene)
+        {
+            if (m_scene == null)
+            {
+                m_scene = scene;
+                m_CreatorID = scene.RegionInfo.RegionID;
+            }
+
+            scene.RegisterModuleInterface<IJ2KDecoder>(this);
+
+        }
+
+        public void RemoveRegion(Scene scene)
+        {
+            if (m_scene == scene)
+                m_scene = null;
+        }
+
         public void PostInitialise()
         {
-            m_cache = m_scene.RequestModuleInterface<IImprovedAssetCache>();
         }
 
         public void Close()
         {
         }
 
-        #endregion IRegionModule
+        public void RegionLoaded(Scene scene)
+        {
+        }
+
+        public Type ReplaceableInterface
+        {
+            get { return null; }
+        }
+
+        #endregion Region Module interface
 
         #region IJ2KDecoder
 
@@ -275,11 +308,11 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
         {
             m_decodedCache.AddOrUpdate(AssetId, Layers, TimeSpan.FromMinutes(10));
 
-            if (m_cache != null)
+            if (Cache != null)
             {
                 string assetID = "j2kCache_" + AssetId.ToString();
 
-                AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard, m_scene.RegionInfo.RegionID.ToString());
+                AssetBase layerDecodeAsset = new AssetBase(assetID, assetID, (sbyte)AssetType.Notecard, m_CreatorID.ToString());
                 layerDecodeAsset.Local = true;
                 layerDecodeAsset.Temporary = true;
 
@@ -299,7 +332,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
 
                 #endregion Serialize Layer Data
 
-                m_cache.Cache(layerDecodeAsset);
+                Cache.Cache(layerDecodeAsset);
             }
         }
 
@@ -309,10 +342,10 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
             {
                 return true;
             }
-            else if (m_cache != null)
+            else if (Cache != null)
             {
                 string assetName = "j2kCache_" + AssetId.ToString();
-                AssetBase layerDecodeAsset = m_cache.Get(assetName);
+                AssetBase layerDecodeAsset = Cache.Get(assetName);
 
                 if (layerDecodeAsset != null)
                 {
@@ -324,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                     if (lines.Length == 0)
                     {
                         m_log.Warn("[J2KDecodeCache]: Expiring corrupted layer data (empty) " + assetName);
-                        m_cache.Expire(assetName);
+                        Cache.Expire(assetName);
                         return false;
                     }
 
@@ -345,7 +378,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                             catch (FormatException)
                             {
                                 m_log.Warn("[J2KDecodeCache]: Expiring corrupted layer data (format) " + assetName);
-                                m_cache.Expire(assetName);
+                                Cache.Expire(assetName);
                                 return false;
                             }
 
@@ -356,7 +389,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
                         else
                         {
                             m_log.Warn("[J2KDecodeCache]: Expiring corrupted layer data (layout) " + assetName);
-                            m_cache.Expire(assetName);
+                            Cache.Expire(assetName);
                             return false;
                         }
                     }
diff --git a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
index b8e2820..4299726 100644
--- a/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Xfer/XferModule.cs
@@ -35,9 +35,12 @@ using OpenSim.Framework;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
 
+using Mono.Addins;
+
 namespace OpenSim.Region.CoreModules.Agent.Xfer
 {
-    public class XferModule : IRegionModule, IXfer
+    [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "XferModule")]
+    public class XferModule : INonSharedRegionModule, IXfer
     {
         private Scene m_scene;
         private Dictionary<string, FileData> NewFiles = new Dictionary<string, FileData>();
@@ -59,9 +62,13 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             public int Count;
         }
        
-        #region IRegionModule Members
+        #region INonSharedRegionModule Members
+
+        public void Initialise(IConfigSource config)
+        {
+        }
 
-        public void Initialise(Scene scene, IConfigSource config)
+        public void AddRegion(Scene scene)
         {
             m_scene = scene;
             m_scene.EventManager.OnNewClient += NewClient;
@@ -69,22 +76,30 @@ namespace OpenSim.Region.CoreModules.Agent.Xfer
             m_scene.RegisterModuleInterface<IXfer>(this);
         }
 
-        public void PostInitialise()
+        public void RemoveRegion(Scene scene)
         {
+            m_scene.EventManager.OnNewClient -= NewClient;
+
+            m_scene.UnregisterModuleInterface<IXfer>(this);
+            m_scene = null;
         }
 
-        public void Close()
+        public void RegionLoaded(Scene scene)
         {
         }
 
-        public string Name
+        public Type ReplaceableInterface
         {
-            get { return "XferModule"; }
+            get { return null; }
         }
 
-        public bool IsSharedModule
+        public void Close()
         {
-            get { return false; }
+        }
+
+        public string Name
+        {
+            get { return "XferModule"; }
         }
 
         #endregion