* 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.

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
 
             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();