diff options
author | Robert Adams | 2014-03-10 22:01:55 -0700 |
---|---|---|
committer | Robert Adams | 2014-03-10 22:05:18 -0700 |
commit | 742f5054408bbd928ea2422dd9abc04ee57c80dc (patch) | |
tree | 03cba6e526914ac7bfefc210afd7179834045c6c /OpenSim/Region/Framework/Scenes/TerrainChannel.cs | |
parent | Don't start KeyframeMotion timers until all the regions are ready. This preve... (diff) | |
download | opensim-SC_OLD-742f5054408bbd928ea2422dd9abc04ee57c80dc.zip opensim-SC_OLD-742f5054408bbd928ea2422dd9abc04ee57c80dc.tar.gz opensim-SC_OLD-742f5054408bbd928ea2422dd9abc04ee57c80dc.tar.bz2 opensim-SC_OLD-742f5054408bbd928ea2422dd9abc04ee57c80dc.tar.xz |
Change terrain update sending to be triggered by frame tick rather
than everytime terrain is changed.
The TerrainModule now hooks the frame event and, if terrain has changed,
sends terrain updates to the clients. This polling pattern replaces
the previous push on change pattern and will make it easier to do per
client throttling and per scene presence terrain update ordering.
Diffstat (limited to '')
-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() |