aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/OpenSimMain.cs
diff options
context:
space:
mode:
authorMW2007-04-02 10:46:59 +0000
committerMW2007-04-02 10:46:59 +0000
commit1ea4ba3a18cf0ccdc512a1cc800e44bc5cf16210 (patch)
tree4022048c8ad28d31a2dd9c87f27bab213a731468 /OpenSim.RegionServer/OpenSimMain.cs
parentFinished putting user server config into Db4o (diff)
downloadopensim-SC_OLD-1ea4ba3a18cf0ccdc512a1cc800e44bc5cf16210.zip
opensim-SC_OLD-1ea4ba3a18cf0ccdc512a1cc800e44bc5cf16210.tar.gz
opensim-SC_OLD-1ea4ba3a18cf0ccdc512a1cc800e44bc5cf16210.tar.bz2
opensim-SC_OLD-1ea4ba3a18cf0ccdc512a1cc800e44bc5cf16210.tar.xz
Moved database storage of the world map to the Db4LocalStorage so its in the same database as in world prims are stored.
Diffstat (limited to 'OpenSim.RegionServer/OpenSimMain.cs')
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs6
1 files changed, 4 insertions, 2 deletions
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
129 m_console.WriteLine("Main.cs:Startup() - We are " + Cfg.RegionName + " at " + Cfg.RegionLocX.ToString() + "," + Cfg.RegionLocY.ToString()); 129 m_console.WriteLine("Main.cs:Startup() - We are " + Cfg.RegionName + " at " + Cfg.RegionLocX.ToString() + "," + Cfg.RegionLocY.ToString());
130 m_console.WriteLine("Initialising world"); 130 m_console.WriteLine("Initialising world");
131 LocalWorld = new World(this._packetServer.ClientThreads, Cfg.RegionHandle, Cfg.RegionName, Cfg); 131 LocalWorld = new World(this._packetServer.ClientThreads, Cfg.RegionHandle, Cfg.RegionName, Cfg);
132 LocalWorld.LandMap = Cfg.LoadWorld(); 132 //LocalWorld.LandMap = Cfg.LoadWorld();
133 LocalWorld.InventoryCache = InventoryCache; 133 LocalWorld.InventoryCache = InventoryCache;
134 LocalWorld.AssetCache = AssetCache; 134 LocalWorld.AssetCache = AssetCache;
135 135
@@ -139,6 +139,9 @@ namespace OpenSim
139 this.physManager = new OpenSim.Physics.Manager.PhysicsManager(); 139 this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
140 this.physManager.LoadPlugins(); 140 this.physManager.LoadPlugins();
141 141
142 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
143 LocalWorld.LoadWorldMap();
144
142 m_console.WriteLine("Main.cs:Startup() - Starting up messaging system"); 145 m_console.WriteLine("Main.cs:Startup() - Starting up messaging system");
143 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use 146 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine); //should be reading from the config file what physics engine to use
144 LocalWorld.PhysScene.SetTerrain(LocalWorld.LandMap); 147 LocalWorld.PhysScene.SetTerrain(LocalWorld.LandMap);
@@ -148,7 +151,6 @@ namespace OpenSim
148 IGridServer gridServer = GridServers.GridServer; 151 IGridServer gridServer = GridServers.GridServer;
149 gridServer.SetServerInfo(Cfg.GridURL, Cfg.GridSendKey, Cfg.GridRecvKey); 152 gridServer.SetServerInfo(Cfg.GridURL, Cfg.GridSendKey, Cfg.GridRecvKey);
150 153
151 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
152 LocalWorld.LoadPrimsFromStorage(); 154 LocalWorld.LoadPrimsFromStorage();
153 155
154 if (m_sandbox) 156 if (m_sandbox)