aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLSimulationData.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/MySQL/MySQLSimulationData.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 '')
-rw-r--r--OpenSim/Data/MySQL/MySQLSimulationData.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLSimulationData.cs b/OpenSim/Data/MySQL/MySQLSimulationData.cs
index 42f2ebb..2921c1c 100644
--- a/OpenSim/Data/MySQL/MySQLSimulationData.cs
+++ b/OpenSim/Data/MySQL/MySQLSimulationData.cs
@@ -616,10 +616,14 @@ namespace OpenSim.Data.MySQL
616 // Legacy region loading 616 // Legacy region loading
617 public double[,] LoadTerrain(UUID regionID) 617 public double[,] LoadTerrain(UUID regionID)
618 { 618 {
619 double[,] ret = null;
619 TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight); 620 TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight);
620 return terrData.GetDoubles(); 621 if (terrData != null)
622 ret = terrData.GetDoubles();
623 return ret;
621 } 624 }
622 625
626 // Returns 'null' if region not found
623 public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ) 627 public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ)
624 { 628 {
625 TerrainData terrData = null; 629 TerrainData terrData = null;