diff options
-rw-r--r-- | OpenSim/Framework/General/Interfaces/ILocalStorage.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs index cd09945..7093121 100644 --- a/OpenSim/Framework/General/Interfaces/ILocalStorage.cs +++ b/OpenSim/Framework/General/Interfaces/ILocalStorage.cs | |||
@@ -43,7 +43,9 @@ namespace OpenSim.Framework.Interfaces | |||
43 | void RemovePrim(LLUUID primID); | 43 | void RemovePrim(LLUUID primID); |
44 | void LoadPrimitives(ILocalStorageReceiver receiver); | 44 | void LoadPrimitives(ILocalStorageReceiver receiver); |
45 | 45 | ||
46 | [System.Obsolete("Use DataStorage instead")] | ||
46 | float[] LoadWorld(); | 47 | float[] LoadWorld(); |
48 | [System.Obsolete("Use DataStorage instead")] | ||
47 | void SaveMap(float[] heightmap); | 49 | void SaveMap(float[] heightmap); |
48 | 50 | ||
49 | void SaveParcels(ParcelData[] parcels); | 51 | void SaveParcels(ParcelData[] parcels); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 839a75a..e370047 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -266,7 +266,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
266 | { | 266 | { |
267 | this.phyScene.SetTerrain(Terrain.getHeights1D()); | 267 | this.phyScene.SetTerrain(Terrain.getHeights1D()); |
268 | } | 268 | } |
269 | this.localStorage.SaveMap(this.Terrain.getHeights1D()); | 269 | |
270 | this.storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD()); | ||
270 | 271 | ||
271 | m_clientManager.ForEachClient(delegate(IClientAPI client) | 272 | m_clientManager.ForEachClient(delegate(IClientAPI client) |
272 | { | 273 | { |
@@ -297,7 +298,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
297 | { | 298 | { |
298 | this.phyScene.SetTerrain(this.Terrain.getHeights1D()); | 299 | this.phyScene.SetTerrain(this.Terrain.getHeights1D()); |
299 | } | 300 | } |
300 | this.localStorage.SaveMap(this.Terrain.getHeights1D()); | 301 | this.storageManager.DataStore.StoreTerrain(Terrain.getHeights2DD()); |
301 | 302 | ||
302 | m_clientManager.ForEachClient(delegate(IClientAPI client) | 303 | m_clientManager.ForEachClient(delegate(IClientAPI client) |
303 | { | 304 | { |