diff options
| author | Justin Clarke Casey | 2008-09-11 13:56:25 +0000 |
|---|---|---|
| committer | Justin Clarke Casey | 2008-09-11 13:56:25 +0000 |
| commit | f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c (patch) | |
| tree | 4e07ccd7e55ae92c18360347796d5af92a057314 /OpenSim/Region/Application | |
| parent | * Removed some legacy commenting (diff) | |
| download | opensim-SC-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.zip opensim-SC-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.tar.gz opensim-SC-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.tar.bz2 opensim-SC-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.tar.xz | |
* Start loading prims after region module configuration rather than before
* In some circumstances, loading prims can invoke region modules
Diffstat (limited to 'OpenSim/Region/Application')
| -rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 5 |
1 files changed, 5 insertions, 0 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 | |||
| 542 | } | 542 | } |
| 543 | 543 | ||
| 544 | scene.SetModuleInterfaces(); | 544 | scene.SetModuleInterfaces(); |
| 545 | |||
| 546 | // Prims have to be loaded after module configuration since some modules may be invoked during the load | ||
| 547 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | ||
| 548 | |||
| 549 | scene.StartTimer(); | ||
| 545 | 550 | ||
| 546 | //moved these here as the terrain texture has to be created after the modules are initialized | 551 | //moved these here as the terrain texture has to be created after the modules are initialized |
| 547 | // and has to happen before the region is registered with the grid. | 552 | // and has to happen before the region is registered with the grid. |