diff options
| author | Melanie | 2014-02-04 01:55:41 +0000 |
|---|---|---|
| committer | Melanie | 2014-02-04 01:55:41 +0000 |
| commit | e1d1c279651784d7290241b8c4b416bc4c96ab3c (patch) | |
| tree | 0a6f258ff2612b0faaf6aceadaa7be09b1f0386e /OpenSim/Data/Null | |
| parent | Dropping the rest of Avination's modified appearance code for core. (diff) | |
| parent | Add "--no-objects" parameter to 'load oar'. (diff) | |
| download | opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.zip opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.gz opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.bz2 opensim-SC-e1d1c279651784d7290241b8c4b416bc4c96ab3c.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Data/Null')
| -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)) |