From 1ea4ba3a18cf0ccdc512a1cc800e44bc5cf16210 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 2 Apr 2007 10:46:59 +0000
Subject: Moved database storage of the world map to the Db4LocalStorage so its
 in the same database as in world prims are stored.

---
 OpenSim.RegionServer/OpenSimMain.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim.RegionServer/OpenSimMain.cs')

diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 74b9e44..bdbe818 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -129,7 +129,7 @@ namespace OpenSim
             m_console.WriteLine("Main.cs:Startup() - We are " + Cfg.RegionName + " at " + Cfg.RegionLocX.ToString() + "," + Cfg.RegionLocY.ToString());
             m_console.WriteLine("Initialising world");
             LocalWorld = new World(this._packetServer.ClientThreads, Cfg.RegionHandle, Cfg.RegionName, Cfg);
-            LocalWorld.LandMap = Cfg.LoadWorld();
+            //LocalWorld.LandMap = Cfg.LoadWorld();
             LocalWorld.InventoryCache = InventoryCache;
             LocalWorld.AssetCache = AssetCache;
 
@@ -139,6 +139,9 @@ namespace OpenSim
             this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
             this.physManager.LoadPlugins();
 
+            LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
+            LocalWorld.LoadWorldMap();
+
             m_console.WriteLine("Main.cs:Startup() - Starting up messaging system");
             LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use
             LocalWorld.PhysScene.SetTerrain(LocalWorld.LandMap);
@@ -148,7 +151,6 @@ namespace OpenSim
             IGridServer gridServer = GridServers.GridServer;
             gridServer.SetServerInfo(Cfg.GridURL, Cfg.GridSendKey, Cfg.GridRecvKey);
 
-            LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
             LocalWorld.LoadPrimsFromStorage();
 
             if (m_sandbox)
-- 
cgit v1.1