aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAdam Frisby2007-07-15 15:53:29 +0000
committerAdam Frisby2007-07-15 15:53:29 +0000
commit813cdd0c80a645e2877e39d5b91882c95583b1ae (patch)
treeb2cc0e361fb867c52478a962817a061c9f716880
parent* Terrain now uses the new StorageManager. (diff)
downloadopensim-SC_OLD-813cdd0c80a645e2877e39d5b91882c95583b1ae.zip
opensim-SC_OLD-813cdd0c80a645e2877e39d5b91882c95583b1ae.tar.gz
opensim-SC_OLD-813cdd0c80a645e2877e39d5b91882c95583b1ae.tar.bz2
opensim-SC_OLD-813cdd0c80a645e2877e39d5b91882c95583b1ae.tar.xz
* Marked old terrain methods as obsolete.
* Missed an item using the old local storage.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/General/Interfaces/ILocalStorage.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs5
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 {