* Start loading prims after region module configuration rather than before

* In some circumstances, loading prims can invoke region modules

2 files changed, 6 insertions, 4 deletions

diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs
index 156d022..1029d90 100644
--- a/OpenSim/Region/Application/OpenSimBase.cs
+++ b/OpenSim/Region/Application/OpenSimBase.cs
@@ -542,6 +542,11 @@ namespace OpenSim
             }
 
             scene.SetModuleInterfaces();
+            
+            // Prims have to be loaded after module configuration since some modules may be invoked during the load            
+            scene.LoadPrimsFromStorage(regionInfo.originRegionID);
+            
+            scene.StartTimer();
 
             //moved these here as the terrain texture has to be created after the modules are initialized
             // and has to happen before the region is registered with the grid.
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index dfe922b..8bb35c1 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -163,10 +163,7 @@ namespace OpenSim.Region.ClientStack
                                  scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName);
                 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
             }
-
-            scene.LoadPrimsFromStorage(regionInfo.originRegionID);
-            scene.StartTimer();
-
+            
             return scene;
         }