diff options
author | Homer Horwitz | 2009-04-13 21:23:12 +0000 |
---|---|---|
committer | Homer Horwitz | 2009-04-13 21:23:12 +0000 |
commit | bcf31a76bbc5bab6cb489c3470f49392c77efd1a (patch) | |
tree | bdf72cbbbbabe8063e3a6be54bee2c48f9b8ad66 | |
parent | make the asserts spit out messages about their test names (diff) | |
download | opensim-SC-bcf31a76bbc5bab6cb489c3470f49392c77efd1a.zip opensim-SC-bcf31a76bbc5bab6cb489c3470f49392c77efd1a.tar.gz opensim-SC-bcf31a76bbc5bab6cb489c3470f49392c77efd1a.tar.bz2 opensim-SC-bcf31a76bbc5bab6cb489c3470f49392c77efd1a.tar.xz |
Fix ordering of operations: First initialize everything, then add regions
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs index 7dc4a74..49a400a 100644 --- a/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs +++ b/OpenSim/ApplicationPlugins/RegionModulesController/RegionModulesControllerPlugin.cs | |||
@@ -159,12 +159,18 @@ namespace OpenSim.ApplicationPlugins.RegionModulesController | |||
159 | scene.AddRegionModule(module.Name, module); | 159 | scene.AddRegionModule(module.Name, module); |
160 | } | 160 | } |
161 | 161 | ||
162 | List<INonSharedRegionModule> list = new List<INonSharedRegionModule>(); | ||
162 | foreach (Type type in m_nonSharedModules) | 163 | foreach (Type type in m_nonSharedModules) |
163 | { | 164 | { |
164 | INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type); | 165 | INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type); |
165 | m_log.DebugFormat("[REGIONMODULE]: Adding scene {0} to non-shared module {1}", | 166 | m_log.DebugFormat("[REGIONMODULE]: Adding scene {0} to non-shared module {1}", |
166 | scene.RegionInfo.RegionName, module.Name); | 167 | scene.RegionInfo.RegionName, module.Name); |
167 | module.Initialise(m_openSim.ConfigSource.Source); | 168 | module.Initialise(m_openSim.ConfigSource.Source); |
169 | list.Add(module); | ||
170 | } | ||
171 | |||
172 | foreach (INonSharedRegionModule module in list) | ||
173 | { | ||
168 | module.AddRegion(scene); | 174 | module.AddRegion(scene); |
169 | scene.AddRegionModule(module.Name, module); | 175 | scene.AddRegionModule(module.Name, module); |
170 | } | 176 | } |