From b3eeb5a8dcdb91d47037234540c5045cdfb9977a Mon Sep 17 00:00:00 2001
From: lbsa71
Date: Sun, 23 Sep 2007 23:55:29 +0000
Subject: * 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.

---
 OpenSim/Region/ClientStack/RegionApplicationBase.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

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();
-- 
cgit v1.1