diff options
| author | Mic Bowman | 2014-01-28 15:47:24 -0800 |
|---|---|---|
| committer | Mic Bowman | 2014-01-28 15:47:24 -0800 |
| commit | 1d533b0f018792c25669b011d1a98daa5d955997 (patch) | |
| tree | 4df7bc87605196590d7f856910a4e29781e1154f /OpenSim/Data/PGSQL/PGSQLSimulationData.cs | |
| parent | Some major surgery on the sun module. Updates to the client were gated (diff) | |
| parent | Repair database routines so they properly return null when asked for (diff) | |
| download | opensim-SC-1d533b0f018792c25669b011d1a98daa5d955997.zip opensim-SC-1d533b0f018792c25669b011d1a98daa5d955997.tar.gz opensim-SC-1d533b0f018792c25669b011d1a98daa5d955997.tar.bz2 opensim-SC-1d533b0f018792c25669b011d1a98daa5d955997.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLSimulationData.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs index 1505f87..77d87d4 100644 --- a/OpenSim/Data/PGSQL/PGSQLSimulationData.cs +++ b/OpenSim/Data/PGSQL/PGSQLSimulationData.cs | |||
| @@ -524,10 +524,14 @@ namespace OpenSim.Data.PGSQL | |||
| 524 | /// <returns></returns> | 524 | /// <returns></returns> |
| 525 | public double[,] LoadTerrain(UUID regionID) | 525 | public double[,] LoadTerrain(UUID regionID) |
| 526 | { | 526 | { |
| 527 | double[,] ret = null; | ||
| 527 | TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight); | 528 | TerrainData terrData = LoadTerrain(regionID, (int)Constants.RegionSize, (int)Constants.RegionSize, (int)Constants.RegionHeight); |
| 528 | return terrData.GetDoubles(); | 529 | if (terrData != null) |
| 530 | ret = terrData.GetDoubles(); | ||
| 531 | return ret; | ||
| 529 | } | 532 | } |
| 530 | 533 | ||
| 534 | // Returns 'null' if region not found | ||
| 531 | public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ) | 535 | public TerrainData LoadTerrain(UUID regionID, int pSizeX, int pSizeY, int pSizeZ) |
| 532 | { | 536 | { |
| 533 | TerrainData terrData = null; | 537 | TerrainData terrData = null; |