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/world/World.cs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'OpenSim.RegionServer/world/World.cs')

diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index aea889d..4f8e53d 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -150,7 +150,7 @@ namespace OpenSim.world
             {
                 this.phyScene.SetTerrain(this.LandMap);
             }
-            m_cfg.SaveMap(this.LandMap);
+            this.localStorage.SaveMap(this.LandMap);
 
             foreach (SimClient client in m_clientThreads.Values)
             {
@@ -171,7 +171,7 @@ namespace OpenSim.world
             {
                 this.phyScene.SetTerrain(this.LandMap);
             }
-            m_cfg.SaveMap(this.LandMap);
+            this.localStorage.SaveMap(this.LandMap);
 
             foreach (SimClient client in m_clientThreads.Values)
             {
@@ -192,7 +192,7 @@ namespace OpenSim.world
                 {
                     this.phyScene.SetTerrain(this.LandMap);
                 }
-                m_cfg.SaveMap(this.LandMap);
+                this.localStorage.SaveMap(this.LandMap);
 
                 foreach (SimClient client in m_clientThreads.Values)
                 {
@@ -201,6 +201,11 @@ namespace OpenSim.world
             }
         }
 
+        public void LoadWorldMap()
+        {
+            LandMap = this.localStorage.LoadWorld();
+        }
+
         public void LoadPrimsFromStorage()
         {
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");
-- 
cgit v1.1