aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs18
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs2
3 files changed, 15 insertions, 13 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 6c0c74d..2e883d6 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -65,9 +65,13 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
65 65
66 public void Initialise (OpenSimBase openSim) 66 public void Initialise (OpenSimBase openSim)
67 { 67 {
68 m_log.DebugFormat("[REGIONMODULES]: Initializing...");
69 m_openSim = openSim; 68 m_openSim = openSim;
70 openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this); 69 }
70
71 public void PostInitialise ()
72 {
73 m_log.DebugFormat("[REGIONMODULES]: Initializing...");
74 m_openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this);
71 75
72 // Who we are 76 // Who we are
73 string id = AddinManager.CurrentAddin.Id; 77 string id = AddinManager.CurrentAddin.Id;
@@ -81,9 +85,9 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
81 85
82 // The [Modules] section in the ini file 86 // The [Modules] section in the ini file
83 IConfig modulesConfig = 87 IConfig modulesConfig =
84 openSim.ConfigSource.Source.Configs["Modules"]; 88 m_openSim.ConfigSource.Source.Configs["Modules"];
85 if (modulesConfig == null) 89 if (modulesConfig == null)
86 modulesConfig = openSim.ConfigSource.Source.AddConfig("Modules"); 90 modulesConfig = m_openSim.ConfigSource.Source.AddConfig("Modules");
87 91
88 // Scan modules and load all that aren't disabled 92 // Scan modules and load all that aren't disabled
89 foreach (TypeExtensionNode node in 93 foreach (TypeExtensionNode node in
@@ -195,7 +199,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
195 199
196 // OK, we're up and running 200 // OK, we're up and running
197 m_sharedInstances.Add(module); 201 m_sharedInstances.Add(module);
198 module.Initialise(openSim.ConfigSource.Source); 202 module.Initialise(m_openSim.ConfigSource.Source);
199 } 203 }
200 204
201 // Immediately run PostInitialise on shared modules 205 // Immediately run PostInitialise on shared modules
@@ -205,10 +209,6 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
205 } 209 }
206 } 210 }
207 211
208 public void PostInitialise ()
209 {
210 }
211
212#endregion 212#endregion
213 213
214#region IPlugin implementation 214#region IPlugin implementation
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index b5019f1..2d4b421 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -61,9 +61,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
61 return; 61 return;
62 } 62 }
63 63
64 MainServer.Instance.AddXmlRPCHandler(
65 "grid_instant_message", processXMLRPCGridInstantMessage);
66
67 m_Enabled = true; 64 m_Enabled = true;
68 } 65 }
69 66
@@ -82,6 +79,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
82 79
83 public virtual void PostInitialise() 80 public virtual void PostInitialise()
84 { 81 {
82 if (!m_Enabled)
83 return;
84
85 MainServer.Instance.AddXmlRPCHandler(
86 "grid_instant_message", processXMLRPCGridInstantMessage);
85 } 87 }
86 88
87 public virtual void RegionLoaded(Scene scene) 89 public virtual void RegionLoaded(Scene scene)
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 1ff5865..24cbaeb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -37,7 +37,7 @@ using OpenSim.Framework.Client;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39 39
40namespace OpenSim.Region.CoreModules.Avatar.MuteList 40namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
41{ 41{
42 public class MuteListModule : ISharedRegionModule 42 public class MuteListModule : ISharedRegionModule
43 { 43 {