OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Start loading prims after region module configuration rather than before 

* In some circumstances, loading prims can invoke region modules
0.6.0-stable
Justin Clarke Casey 2008-09-11 13:56:25 +00:00
parent e04ce96cee
commit f3497d9f57
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -543,6 +543,11 @@ namespace OpenSim
scene.SetModuleInterfaces(); 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 //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. // and has to happen before the region is registered with the grid.
scene.CreateTerrainTexture(false); scene.CreateTerrainTexture(false);

3
OpenSim/Region/ClientStack/RegionApplicationBase.cs
View File

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