diff options
| author | Mic Bowman | 2014-01-28 16:34:49 -0800 |
|---|---|---|
| committer | Mic Bowman | 2014-01-28 16:34:49 -0800 |
| commit | cfe1bced7d4477bd231d08f5394c30622a3156d1 (patch) | |
| tree | a16436379b41951a93d9a10ffaa7b5d5a14ff37f /OpenSim/Framework | |
| parent | Actually make the parameter updates change the behavior of (diff) | |
| parent | clear land tainting when tested. Then testing, pass scene to LandObject as no... (diff) | |
| download | opensim-SC-cfe1bced7d4477bd231d08f5394c30622a3156d1.zip opensim-SC-cfe1bced7d4477bd231d08f5394c30622a3156d1.tar.gz opensim-SC-cfe1bced7d4477bd231d08f5394c30622a3156d1.tar.bz2 opensim-SC-cfe1bced7d4477bd231d08f5394c30622a3156d1.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Framework')
| -rw-r--r-- | OpenSim/Framework/TerrainData.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Framework/TerrainData.cs b/OpenSim/Framework/TerrainData.cs index d1e0e7e..9325df2 100644 --- a/OpenSim/Framework/TerrainData.cs +++ b/OpenSim/Framework/TerrainData.cs | |||
| @@ -160,7 +160,11 @@ namespace OpenSim.Framework | |||
| 160 | 160 | ||
| 161 | public override bool IsTaintedAt(int xx, int yy) | 161 | public override bool IsTaintedAt(int xx, int yy) |
| 162 | { | 162 | { |
| 163 | return m_taint[xx / Constants.TerrainPatchSize, yy / Constants.TerrainPatchSize]; | 163 | int tx = xx / Constants.TerrainPatchSize; |
| 164 | int ty = yy / Constants.TerrainPatchSize; | ||
| 165 | bool ret = m_taint[tx, ty]; | ||
| 166 | m_taint[tx, ty] = false; | ||
| 167 | return ret; | ||
| 164 | } | 168 | } |
| 165 | 169 | ||
| 166 | // TerrainData.GetDatabaseBlob | 170 | // TerrainData.GetDatabaseBlob |