diff options
| author | Justin Clark-Casey (justincc) | 2014-03-11 23:39:07 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-03-11 23:39:07 +0000 |
| commit | 86630a1b70bc2d1c51bf9753e17030c584fb9aa6 (patch) | |
| tree | a5870dbc8fa6242c6a5017d45fc1b49cc5c9a0c2 /OpenSim/Region/Framework/Scenes | |
| parent | Instead of auto-creating a parcel on request if one doesn't cover a given loc... (diff) | |
| parent | varregion: remove serialization of region terrain to floats when sending patc... (diff) | |
| download | opensim-SC-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.zip opensim-SC-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.gz opensim-SC-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.bz2 opensim-SC-86630a1b70bc2d1c51bf9753e17030c584fb9aa6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/TerrainChannel.cs | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs index 60dc6c9..cc040a6 100644 --- a/OpenSim/Region/Framework/Scenes/TerrainChannel.cs +++ b/OpenSim/Region/Framework/Scenes/TerrainChannel.cs | |||
| @@ -124,17 +124,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 124 | // and the caller will probably do the wrong thing if the terrain is not the legacy 256x256. | 124 | // and the caller will probably do the wrong thing if the terrain is not the legacy 256x256. |
| 125 | public float[] GetFloatsSerialised() | 125 | public float[] GetFloatsSerialised() |
| 126 | { | 126 | { |
| 127 | int points = Width * Height; | 127 | return m_terrainData.GetFloatsSerialized(); |
| 128 | float[] heights = new float[points]; | ||
| 129 | |||
| 130 | int idx = 0; | ||
| 131 | for (int jj = 0; jj < Height; jj++) | ||
| 132 | for (int ii = 0; ii < Width; ii++) | ||
| 133 | { | ||
| 134 | heights[idx++] = m_terrainData[ii, jj]; | ||
| 135 | } | ||
| 136 | |||
| 137 | return heights; | ||
| 138 | } | 128 | } |
| 139 | 129 | ||
| 140 | // ITerrainChannel.GetDoubles() | 130 | // ITerrainChannel.GetDoubles() |