aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-01-11 14:39:15 -0800
committerDiva Canto2010-01-11 14:39:15 -0800
commit4e7c449c5a2ac8479ee302513a549ee56132140e (patch)
tree8cc2688fab2adb0484b4a428f7fef3b38e9621a3
parentMoved MainServer.Instance.AddStreamHandler(new OpenSim.SimStatusHandler()); a... (diff)
downloadopensim-SC_OLD-4e7c449c5a2ac8479ee302513a549ee56132140e.zip
opensim-SC_OLD-4e7c449c5a2ac8479ee302513a549ee56132140e.tar.gz
opensim-SC_OLD-4e7c449c5a2ac8479ee302513a549ee56132140e.tar.bz2
opensim-SC_OLD-4e7c449c5a2ac8479ee302513a549ee56132140e.tar.xz
This fixes the problem that region modules (new style) weren't being recognized.
-rw-r--r--OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs22
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs1
2 files changed, 14 insertions, 9 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
index 2e883d6..9d79b3a 100644
--- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs
@@ -66,12 +66,8 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
66 public void Initialise (OpenSimBase openSim) 66 public void Initialise (OpenSimBase openSim)
67 { 67 {
68 m_openSim = openSim; 68 m_openSim = openSim;
69 }
70
71 public void PostInitialise ()
72 {
73 m_log.DebugFormat("[REGIONMODULES]: Initializing...");
74 m_openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this); 69 m_openSim.ApplicationRegistry.RegisterInterface<IRegionModulesController>(this);
70 m_log.DebugFormat("[REGIONMODULES]: Initializing...");
75 71
76 // Who we are 72 // Who we are
77 string id = AddinManager.CurrentAddin.Id; 73 string id = AddinManager.CurrentAddin.Id;
@@ -108,7 +104,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
108 continue; 104 continue;
109 105
110 // Split off port, if present 106 // Split off port, if present
111 string[] moduleParts = moduleString.Split(new char[] {'/'}, 2); 107 string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
112 // Format is [port/][class] 108 // Format is [port/][class]
113 string className = moduleParts[0]; 109 string className = moduleParts[0];
114 if (moduleParts.Length > 1) 110 if (moduleParts.Length > 1)
@@ -138,7 +134,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
138 continue; 134 continue;
139 135
140 // Split off port, if present 136 // Split off port, if present
141 string[] moduleParts = moduleString.Split(new char[] {'/'}, 2); 137 string[] moduleParts = moduleString.Split(new char[] { '/' }, 2);
142 // Format is [port/][class] 138 // Format is [port/][class]
143 string className = moduleParts[0]; 139 string className = moduleParts[0];
144 if (moduleParts.Length > 1) 140 if (moduleParts.Length > 1)
@@ -166,7 +162,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
166 // 162 //
167 foreach (TypeExtensionNode node in m_sharedModules) 163 foreach (TypeExtensionNode node in m_sharedModules)
168 { 164 {
169 Object[] ctorArgs = new Object[] {(uint)0}; 165 Object[] ctorArgs = new Object[] { (uint)0 };
170 166
171 // Read the config again 167 // Read the config again
172 string moduleString = 168 string moduleString =
@@ -176,7 +172,7 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
176 if (moduleString != String.Empty) 172 if (moduleString != String.Empty)
177 { 173 {
178 // Get the port number from the string 174 // Get the port number from the string
179 string[] moduleParts = moduleString.Split(new char[] {'/'}, 175 string[] moduleParts = moduleString.Split(new char[] { '/' },
180 2); 176 2);
181 if (moduleParts.Length > 1) 177 if (moduleParts.Length > 1)
182 ctorArgs[0] = Convert.ToUInt32(moduleParts[0]); 178 ctorArgs[0] = Convert.ToUInt32(moduleParts[0]);
@@ -202,11 +198,19 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController
202 module.Initialise(m_openSim.ConfigSource.Source); 198 module.Initialise(m_openSim.ConfigSource.Source);
203 } 199 }
204 200
201
202 }
203
204 public void PostInitialise ()
205 {
206 m_log.DebugFormat("[REGIONMODULES]: PostInitializing...");
207
205 // Immediately run PostInitialise on shared modules 208 // Immediately run PostInitialise on shared modules
206 foreach (ISharedRegionModule module in m_sharedInstances) 209 foreach (ISharedRegionModule module in m_sharedInstances)
207 { 210 {
208 module.PostInitialise(); 211 module.PostInitialise();
209 } 212 }
213
210 } 214 }
211 215
212#endregion 216#endregion
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index f3f715a..c6932cf 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -197,6 +197,7 @@ namespace OpenSim
197 LoadPlugins(); 197 LoadPlugins();
198 foreach (IApplicationPlugin plugin in m_plugins) 198 foreach (IApplicationPlugin plugin in m_plugins)
199 { 199 {
200 m_log.Debug("XXX PostInitialise " + plugin.Name);
200 plugin.PostInitialise(); 201 plugin.PostInitialise();
201 } 202 }
202 203