aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Storage
diff options
context:
space:
mode:
authorAdam Frisby2007-04-11 05:19:27 +0000
committerAdam Frisby2007-04-11 05:19:27 +0000
commitadb56a46f49127911a2df169c86f2cdfde034966 (patch)
treec5a7b5e279f93538c9506f630b7304b9d55e93e8 /OpenSim.Storage
parent(no commit message) (diff)
downloadopensim-SC_OLD-adb56a46f49127911a2df169c86f2cdfde034966.zip
opensim-SC_OLD-adb56a46f49127911a2df169c86f2cdfde034966.tar.gz
opensim-SC_OLD-adb56a46f49127911a2df169c86f2cdfde034966.tar.bz2
opensim-SC_OLD-adb56a46f49127911a2df169c86f2cdfde034966.tar.xz
Major ass changes to terrain (now uses libTerrain-BSD!) and all-round improvements to code quality. Terrain saving/loading may work now (running through setHeights1D and getHeights1D before DB4o) **WARNING: UNTESTED**
Diffstat (limited to 'OpenSim.Storage')
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs6
-rw-r--r--OpenSim.Storage/LocalStorageDb4o/MapStorage.cs2
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
index 189ee1a..da77701 100644
--- a/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/Db4LocalStorage.cs
@@ -118,11 +118,11 @@ namespace OpenSim.Storage.LocalStorageDb4o
118 } 118 }
119 } 119 }
120 120
121 public float[,] LoadWorld() 121 public float[] LoadWorld()
122 { 122 {
123 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Loading world...."); 123 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Loading world....");
124 //World blank = new World(); 124 //World blank = new World();
125 float[,] heightmap = null; 125 float[] heightmap = null;
126 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Looking for a heightmap in local DB"); 126 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LoadWorld() - Looking for a heightmap in local DB");
127 IObjectSet world_result = db.Get(typeof(MapStorage)); 127 IObjectSet world_result = db.Get(typeof(MapStorage));
128 if (world_result.Count > 0) 128 if (world_result.Count > 0)
@@ -150,7 +150,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
150 return heightmap; 150 return heightmap;
151 } 151 }
152 152
153 public void SaveMap(float[,] heightmap) 153 public void SaveMap(float[] heightmap)
154 { 154 {
155 IObjectSet world_result = db.Get(typeof(MapStorage)); 155 IObjectSet world_result = db.Get(typeof(MapStorage));
156 if (world_result.Count > 0) 156 if (world_result.Count > 0)
diff --git a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs b/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
index dc5793e..db590ff 100644
--- a/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
+++ b/OpenSim.Storage/LocalStorageDb4o/MapStorage.cs
@@ -6,7 +6,7 @@ namespace OpenSim.Storage.LocalStorageDb4o
6{ 6{
7 public class MapStorage 7 public class MapStorage
8 { 8 {
9 public float[,] Map; 9 public float[] Map;
10 10
11 public MapStorage() 11 public MapStorage()
12 { 12 {