From f3497d9f576a9da1514dafdf8b7fd2522d4aaf0c Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Thu, 11 Sep 2008 13:56:25 +0000 Subject: [PATCH] * Start loading prims after region module configuration rather than before * In some circumstances, loading prims can invoke region modules --- OpenSim/Region/Application/OpenSimBase.cs | 5 +++++ OpenSim/Region/ClientStack/RegionApplicationBase.cs | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 156d0223ac..1029d908bb 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 dfe922ba00..8bb35c1992 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; }