* Purged 'Regions' code pending Agent layer grok.

* Changed so prims aren't loaded until AFTER parcels.
* The region startup flow is still an ungodly rats nest.
This commit is contained in:
lbsa71
2007-09-23 23:55:29 +00:00
parent 8dda11d17e
commit b3eeb5a8dc
9 changed files with 16 additions and 125 deletions

View File

@@ -70,8 +70,6 @@ namespace OpenSim.Region.ClientStack
Initialize();
ScenePresence.CreateDefaultTextureEntry();
m_httpServer = new BaseHttpServer(m_httpServerPort);
m_log.Verbose("Starting HTTP server");
@@ -112,7 +110,6 @@ namespace OpenSim.Region.ClientStack
scene.PhysScene = GetPhysicsScene();
scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
scene.LoadPrimsFromStorage();
//Master Avatar Setup
UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword);
@@ -128,7 +125,9 @@ namespace OpenSim.Region.ClientStack
scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
//TODO: Load parcels from storageManager
}
scene.LandManager.resetSimLandObjects();
scene.LoadPrimsFromStorage();
scene.performParcelPrimCountUpdate();
scene.StartTimer();