aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/RegionApplicationBase.cs
diff options
context:
space:
mode:
authorlbsa712007-09-23 23:55:29 +0000
committerlbsa712007-09-23 23:55:29 +0000
commitb3eeb5a8dcdb91d47037234540c5045cdfb9977a (patch)
tree47e5965e061861cb1ee57bee4b319b432e8f63d8 /OpenSim/Region/ClientStack/RegionApplicationBase.cs
parentfix to do hollow prims correctly. Reported from (diff)
downloadopensim-SC_OLD-b3eeb5a8dcdb91d47037234540c5045cdfb9977a.zip
opensim-SC_OLD-b3eeb5a8dcdb91d47037234540c5045cdfb9977a.tar.gz
opensim-SC_OLD-b3eeb5a8dcdb91d47037234540c5045cdfb9977a.tar.bz2
opensim-SC_OLD-b3eeb5a8dcdb91d47037234540c5045cdfb9977a.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Region/ClientStack/RegionApplicationBase.cs')
-rw-r--r--OpenSim/Region/ClientStack/RegionApplicationBase.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/RegionApplicationBase.cs b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
index df8d747..a1ec4e3 100644
--- a/OpenSim/Region/ClientStack/RegionApplicationBase.cs
+++ b/OpenSim/Region/ClientStack/RegionApplicationBase.cs
@@ -70,8 +70,6 @@ namespace OpenSim.Region.ClientStack
70 70
71 Initialize(); 71 Initialize();
72 72
73 ScenePresence.CreateDefaultTextureEntry();
74
75 m_httpServer = new BaseHttpServer(m_httpServerPort); 73 m_httpServer = new BaseHttpServer(m_httpServerPort);
76 74
77 m_log.Verbose("Starting HTTP server"); 75 m_log.Verbose("Starting HTTP server");
@@ -112,7 +110,6 @@ namespace OpenSim.Region.ClientStack
112 110
113 scene.PhysScene = GetPhysicsScene(); 111 scene.PhysScene = GetPhysicsScene();
114 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D()); 112 scene.PhysScene.SetTerrain(scene.Terrain.GetHeights1D());
115 scene.LoadPrimsFromStorage();
116 113
117 //Master Avatar Setup 114 //Master Avatar Setup
118 UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword); 115 UserProfileData masterAvatar = m_commsManager.UserServer.SetupMasterUser(scene.RegionInfo.MasterAvatarFirstName, scene.RegionInfo.MasterAvatarLastName, scene.RegionInfo.MasterAvatarSandboxPassword);
@@ -128,7 +125,9 @@ namespace OpenSim.Region.ClientStack
128 scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero; 125 scene.RegionInfo.MasterAvatarAssignedUUID = libsecondlife.LLUUID.Zero;
129 //TODO: Load parcels from storageManager 126 //TODO: Load parcels from storageManager
130 } 127 }
128
131 scene.LandManager.resetSimLandObjects(); 129 scene.LandManager.resetSimLandObjects();
130 scene.LoadPrimsFromStorage();
132 131
133 scene.performParcelPrimCountUpdate(); 132 scene.performParcelPrimCountUpdate();
134 scene.StartTimer(); 133 scene.StartTimer();