aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/SQLite/SQLiteSimulationData.cs
diff options
context:
space:
mode:
authorRobert Adams2014-01-28 15:29:06 -0800
committerRobert Adams2014-01-28 15:29:06 -0800
commite5d59dc696e647624047465e0e718f2c65106b3c (patch)
tree770acd7476569391902665c332ad7679f821a3b7 /OpenSim/Data/SQLite/SQLiteSimulationData.cs
parentMerge branch 'master' into varregion (diff)
downloadopensim-SC_OLD-e5d59dc696e647624047465e0e718f2c65106b3c.zip
opensim-SC_OLD-e5d59dc696e647624047465e0e718f2c65106b3c.tar.gz
opensim-SC_OLD-e5d59dc696e647624047465e0e718f2c65106b3c.tar.bz2
opensim-SC_OLD-e5d59dc696e647624047465e0e718f2c65106b3c.tar.xz
Repair database routines so they properly return null when asked for
the heighmap of a region that does not exist.
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteSimulationData.cs')
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 5a34f09..9466e99 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -870,10 +870,14 @@ namespace OpenSim.Data.SQLite
870 /// <returns>Heightfield data</returns> 870 /// <returns>Heightfield data</returns>
871 public double[,] LoadTerrain(UUID regionID) 871 public double[,] LoadTerrain(UUID regionID)
872 { 872 {
873 double[,] ret = null;
873 TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight); 874 TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight);
874 return terrData.GetDoubles(); 875 if (terrData != null)
876 ret = terrData.GetDoubles();
877 return ret;
875 } 878 }
876 879
880 // Returns 'null' if region not found
877 public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ) 881 public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
878 { 882 {
879 TerrainData terrData = null; 883 TerrainData terrData = null;