aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-11 13:56:25 +0000
committerJustin Clarke Casey2008-09-11 13:56:25 +0000
commitf3497d9f576a9da1514dafdf8b7fd2522d4aaf0c (patch)
tree4e07ccd7e55ae92c18360347796d5af92a057314 /OpenSim/Region
parent* Removed some legacy commenting (diff)
downloadopensim-SC_OLD-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.zip
opensim-SC_OLD-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.tar.gz
opensim-SC_OLD-f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c.tar.bz2
opensim-SC_OLD-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')
-rw-r--r--OpenSim/Region/Application/OpenSimBase.cs5
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs5
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
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.
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
163 scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName); 163 scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName);
164 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID; 164 scene.RegionInfo.MasterAvatarAssignedUUID = masterAvatar.ID;
165 } 165 }
166 166
167 scene.LoadPrimsFromStorage(regionInfo.originRegionID);
168 scene.StartTimer();
169
170 return scene; 167 return scene;
171 } 168 }
172 169