Fix ordering of operations: First initialize everything, then add regions

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
                 scene.AddRegionModule(module.Name, module);
             }
 
+            List<INonSharedRegionModule> list = new List<INonSharedRegionModule>();
             foreach (Type type in m_nonSharedModules)
             {
                 INonSharedRegionModule module = (INonSharedRegionModule)Activator.CreateInstance(type);
                 m_log.DebugFormat("[REGIONMODULE]: Adding scene {0} to non-shared module {1}",
                                   scene.RegionInfo.RegionName, module.Name);
                 module.Initialise(m_openSim.ConfigSource.Source);
+                list.Add(module);
+            }
+
+            foreach (INonSharedRegionModule module in list)
+            {
                 module.AddRegion(scene);
                 scene.AddRegionModule(module.Name, module);
             }