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/Null/NullSimulationData.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_OLD-1d533b0f018792c25669b011d1a98daa5d955997.zip opensim-SC_OLD-1d533b0f018792c25669b011d1a98daa5d955997.tar.gz opensim-SC_OLD-1d533b0f018792c25669b011d1a98daa5d955997.tar.bz2 opensim-SC_OLD-1d533b0f018792c25669b011d1a98daa5d955997.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/Null/NullSimulationData.cs')
| -rw-r--r-- | OpenSim/Data/Null/NullSimulationData.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Data/Null/NullSimulationData.cs b/OpenSim/Data/Null/NullSimulationData.cs index acde1a1..deeaced 100644 --- a/OpenSim/Data/Null/NullSimulationData.cs +++ b/OpenSim/Data/Null/NullSimulationData.cs | |||
| @@ -148,6 +148,7 @@ namespace OpenSim.Data.Null | |||
| 148 | } | 148 | } |
| 149 | 149 | ||
| 150 | // Legacy. Just don't do this. | 150 | // Legacy. Just don't do this. |
| 151 | // Returns 'null' if region not found | ||
| 151 | public double[,] LoadTerrain(UUID regionID) | 152 | public double[,] LoadTerrain(UUID regionID) |
| 152 | { | 153 | { |
| 153 | if (m_terrains.ContainsKey(regionID)) | 154 | if (m_terrains.ContainsKey(regionID)) |