diff options
author | Melanie | 2013-03-23 11:31:34 +0100 |
---|---|---|
committer | Melanie | 2013-03-23 11:31:34 +0100 |
commit | 8bc43ea773f6a56d34222f03c6ad7645b59347bf (patch) | |
tree | 4426b54b77a53014c7e90019124f26e338e40d26 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |
parent | Fix SceneManager to use the new automatic property throughout. (diff) | |
parent | Merge branch 'avination' into careminster (diff) | |
download | opensim-SC-8bc43ea773f6a56d34222f03c6ad7645b59347bf.zip opensim-SC-8bc43ea773f6a56d34222f03c6ad7645b59347bf.tar.gz opensim-SC-8bc43ea773f6a56d34222f03c6ad7645b59347bf.tar.bz2 opensim-SC-8bc43ea773f6a56d34222f03c6ad7645b59347bf.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs index e8040d8..a60946d 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs | |||
@@ -263,6 +263,7 @@ public sealed class BSTerrainManager : IDisposable | |||
263 | 263 | ||
264 | if (MegaRegionParentPhysicsScene == null) | 264 | if (MegaRegionParentPhysicsScene == null) |
265 | { | 265 | { |
266 | // This terrain is not part of the mega-region scheme. Create vanilla terrain. | ||
266 | BSTerrainPhys newTerrainPhys = BuildPhysicalTerrain(terrainRegionBase, id, heightMap, minCoords, maxCoords); | 267 | BSTerrainPhys newTerrainPhys = BuildPhysicalTerrain(terrainRegionBase, id, heightMap, minCoords, maxCoords); |
267 | m_terrains.Add(terrainRegionBase, newTerrainPhys); | 268 | m_terrains.Add(terrainRegionBase, newTerrainPhys); |
268 | 269 | ||