aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer/world
diff options
context:
space:
mode:
authorMW2007-04-02 10:46:59 +0000
committerMW2007-04-02 10:46:59 +0000
commit1ea4ba3a18cf0ccdc512a1cc800e44bc5cf16210 (patch)
tree4022048c8ad28d31a2dd9c87f27bab213a731468 /OpenSim.RegionServer/world
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/world')
-rw-r--r--OpenSim.RegionServer/world/World.cs11
1 files changed, 8 insertions, 3 deletions
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
150 { 150 {
151 this.phyScene.SetTerrain(this.LandMap); 151 this.phyScene.SetTerrain(this.LandMap);
152 } 152 }
153 m_cfg.SaveMap(this.LandMap); 153 this.localStorage.SaveMap(this.LandMap);
154 154
155 foreach (SimClient client in m_clientThreads.Values) 155 foreach (SimClient client in m_clientThreads.Values)
156 { 156 {
@@ -171,7 +171,7 @@ namespace OpenSim.world
171 { 171 {
172 this.phyScene.SetTerrain(this.LandMap); 172 this.phyScene.SetTerrain(this.LandMap);
173 } 173 }
174 m_cfg.SaveMap(this.LandMap); 174 this.localStorage.SaveMap(this.LandMap);
175 175
176 foreach (SimClient client in m_clientThreads.Values) 176 foreach (SimClient client in m_clientThreads.Values)
177 { 177 {
@@ -192,7 +192,7 @@ namespace OpenSim.world
192 { 192 {
193 this.phyScene.SetTerrain(this.LandMap); 193 this.phyScene.SetTerrain(this.LandMap);
194 } 194 }
195 m_cfg.SaveMap(this.LandMap); 195 this.localStorage.SaveMap(this.LandMap);
196 196
197 foreach (SimClient client in m_clientThreads.Values) 197 foreach (SimClient client in m_clientThreads.Values)
198 { 198 {
@@ -201,6 +201,11 @@ namespace OpenSim.world
201 } 201 }
202 } 202 }
203 203
204 public void LoadWorldMap()
205 {
206 LandMap = this.localStorage.LoadWorld();
207 }
208
204 public void LoadPrimsFromStorage() 209 public void LoadPrimsFromStorage()
205 { 210 {
206 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives"); 211 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs: LoadPrimsFromStorage() - Loading primitives");