aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins/RegionModulesController
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs28
1 files changed, 16 insertions, 12 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 6c0c74d..9d79b3a 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -65,9 +65,9 @@ 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 m_openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this);
70 m_log.DebugFormat("[REGIONMODULES]: Initializing...");
71 71
72 // Who we are 72 // Who we are
73 string id = AddinManager.CurrentAddin.Id; 73 string id = AddinManager.CurrentAddin.Id;
@@ -81,9 +81,9 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
81 81
82 // The [Modules] section in the ini file 82 // The [Modules] section in the ini file
83 IConfig modulesConfig = 83 IConfig modulesConfig =
84 openSim.ConfigSource.Source.Configs["Modules"]; 84 m_openSim.ConfigSource.Source.Configs["Modules"];
85 if (modulesConfig == null) 85 if (modulesConfig == null)
86 modulesConfig = openSim.ConfigSource.Source.AddConfig("Modules"); 86 modulesConfig = m_openSim.ConfigSource.Source.AddConfig("Modules");
87 87
88 // Scan modules and load all that aren't disabled 88 // Scan modules and load all that aren't disabled
89 foreach (TypeExtensionNode node in 89 foreach (TypeExtensionNode node in
@@ -104,7 +104,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
104 continue; 104 continue;
105 105
106 // Split off port, if present 106 // Split off port, if present
107 string[] moduleParts = moduleString.Split(new char[] {'/'}, 2); 107 string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
108 // Format is [port/][class] 108 // Format is [port/][class]
109 string className = moduleParts[0]; 109 string className = moduleParts[0];
110 if (moduleParts.Length > 1) 110 if (moduleParts.Length > 1)
@@ -134,7 +134,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
134 continue; 134 continue;
135 135
136 // Split off port, if present 136 // Split off port, if present
137 string[] moduleParts = moduleString.Split(new char[] {'/'}, 2); 137 string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
138 // Format is [port/][class] 138 // Format is [port/][class]
139 string className = moduleParts[0]; 139 string className = moduleParts[0];
140 if (moduleParts.Length > 1) 140 if (moduleParts.Length > 1)
@@ -162,7 +162,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
162 // 162 //
163 foreach (TypeExtensionNode node in m_sharedModules) 163 foreach (TypeExtensionNode node in m_sharedModules)
164 { 164 {
165 Object[] ctorArgs = new Object[] {(uint)0}; 165 Object[] ctorArgs = new Object[] { (uint)0 };
166 166
167 // Read the config again 167 // Read the config again
168 string moduleString = 168 string moduleString =
@@ -172,7 +172,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
172 if (moduleString != String.Empty) 172 if (moduleString != String.Empty)
173 { 173 {
174 // Get the port number from the string 174 // Get the port number from the string
175 string[] moduleParts = moduleString.Split(new char[] {'/'}, 175 string[] moduleParts = moduleString.Split(new char[] { '/' },
176 2); 176 2);
177 if (moduleParts.Length > 1) 177 if (moduleParts.Length > 1)
178 ctorArgs[0] = Convert.ToUInt32(moduleParts[0]); 178 ctorArgs[0] = Convert.ToUInt32(moduleParts[0]);
@@ -195,18 +195,22 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
195 195
196 // OK, we're up and running 196 // OK, we're up and running
197 m_sharedInstances.Add(module); 197 m_sharedInstances.Add(module);
198 module.Initialise(openSim.ConfigSource.Source); 198 module.Initialise(m_openSim.ConfigSource.Source);
199 } 199 }
200 200
201
202 }
203
204 public void PostInitialise ()
205 {
206 m_log.DebugFormat("[REGIONMODULES]: PostInitializing...");
207
201 // Immediately run PostInitialise on shared modules 208 // Immediately run PostInitialise on shared modules
202 foreach (ISharedRegionModule module in m_sharedInstances) 209 foreach (ISharedRegionModule module in m_sharedInstances)
203 { 210 {
204 module.PostInitialise(); 211 module.PostInitialise();
205 } 212 }
206 }
207 213
208 public void PostInitialise ()
209 {
210 } 214 }
211 215
212#endregion 216#endregion