* Start loading prims after region module configuration rather than before

* In some circumstances, loading prims can invoke region modules

OpenSim/Region/Application/OpenSimBase.cs

@@ -543,6 +543,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.
             scene.CreateTerrainTexture(false);

OpenSim/Region/ClientStack/RegionApplicationBase.cs

@@ -164,9 +164,6 @@ namespace OpenSim.Region.ClientStack
                 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
             }
             
-            scene.LoadPrimsFromStorage(regionInfo.originRegionID);
-            scene.StartTimer();
-
             return scene;
         }