From a87a247f0548d39a8c39b1d28123d7da8db44598 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 29 Jan 2010 07:20:13 +0000
Subject: Revert "Updates all IRegionModules to the new style region modules."
This reverts commit ec3c31e61e5e540f822891110df9bc978655bbaf.
---
.../Agent/TextureSender/J2KDecoderModule.cs | 33 +++++-----------------
1 file changed, 7 insertions(+), 26 deletions(-)
(limited to 'OpenSim/Region/CoreModules/Agent/TextureSender')
diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
index ff87493..7ac8bed 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs
@@ -32,7 +32,6 @@ using System.Reflection;
using System.Text;
using System.Threading;
using log4net;
-using Mono.Addins;
using Nini.Config;
using OpenMetaverse;
using OpenMetaverse.Imaging;
@@ -46,8 +45,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
{
public delegate void J2KDecodeDelegate(UUID assetID);
- [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
- public class J2KDecoderModule : ISharedRegionModule, IJ2KDecoder
+ public class J2KDecoderModule : IRegionModule, IJ2KDecoder
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -60,19 +58,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
/// Reference to a scene (doesn't matter which one as long as it can load the cache module)
private Scene m_scene;
- #region ISharedRegionModule
+ #region IRegionModule
public string Name { get { return "J2KDecoderModule"; } }
-
- public J2KDecoderModule()
- {
- }
+ public bool IsSharedModule { get { return true; } }
- public void Initialise(IConfigSource source)
+ public J2KDecoderModule()
{
}
- public void AddRegion(Scene scene)
+ public void Initialise(Scene scene, IConfigSource source)
{
if (m_scene == null)
m_scene = scene;
@@ -80,30 +75,16 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender
scene.RegisterModuleInterface(this);
}
- public Type ReplaceableInterface
- {
- get { return null; }
- }
-
- public void RegionLoaded(Scene scene)
- {
- m_cache = m_scene.RequestModuleInterface();
- }
-
- public void RemoveRegion(Scene scene)
- {
- scene.UnregisterModuleInterface(this);
- }
-
public void PostInitialise()
{
+ m_cache = m_scene.RequestModuleInterface();
}
public void Close()
{
}
- #endregion
+ #endregion IRegionModule
#region IJ2KDecoder
--
cgit v1.1