aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
diff options
context:
space:
mode:
authorMelanie2013-03-23 11:31:34 +0100
committerMelanie2013-03-23 11:31:34 +0100
commit8bc43ea773f6a56d34222f03c6ad7645b59347bf (patch)
tree4426b54b77a53014c7e90019124f26e338e40d26 /OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
parentFix SceneManager to use the new automatic property throughout. (diff)
parentMerge branch 'avination' into careminster (diff)
downloadopensim-SC_OLD-8bc43ea773f6a56d34222f03c6ad7645b59347bf.zip
opensim-SC_OLD-8bc43ea773f6a56d34222f03c6ad7645b59347bf.tar.gz
opensim-SC_OLD-8bc43ea773f6a56d34222f03c6ad7645b59347bf.tar.bz2
opensim-SC_OLD-8bc43ea773f6a56d34222f03c6ad7645b59347bf.tar.xz
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to '')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs1
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