3 files changed, 46 insertions, 5 deletions

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index 58dccea..0e73d04 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -1145,6 +1145,11 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
             (s,p,l,v) => { s.UpdateParameterObject(ref s.m_params[0].contactProcessingThreshold, p, l, v); },
             (s,o,v) => { BulletSimAPI.SetContactProcessingThreshold2(o.PhysBody.ptr, v); } ),
 
+            new ParameterDefn("TerrainImplementation", "Type of shape to use for terrain (0=heightmap, 1=mesh)",
+            (float)BSTerrainPhys.TerrainImplementation.Mesh,
+            (s,cf,p,v) => { s.m_params[0].terrainImplementation = cf.GetFloat(p,v); },
+            (s) => { return s.m_params[0].terrainImplementation; },
+            (s,p,l,v) => { s.m_params[0].terrainImplementation = v; } ),
         new ParameterDefn("TerrainFriction", "Factor to reduce movement against terrain surface" ,
             0.5f,
             (s,cf,p,v) => { s.m_params[0].terrainFriction = cf.GetFloat(p, v); },
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
index ed0dfa8..b88f561 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSTerrainManager.cs
@@ -44,6 +44,12 @@ namespace OpenSim.Region.Physics.BulletSPlugin
 // The physical implementation of the terrain is wrapped in this class.
 public abstract class BSTerrainPhys : IDisposable
 {
+    public enum TerrainImplementation
+    {
+        Heightmap   = 0,
+        Mesh        = 1
+    }
+
     public BSScene PhysicsScene { get; private set; }
     // Base of the region in world coordinates. Coordinates inside the region are relative to this.
     public Vector3 TerrainBase { get; private set; }
@@ -246,12 +252,27 @@ public sealed class BSTerrainManager
                 // Release any physical memory it may be using.
                 terrainPhys.Dispose();
 
+                BSTerrainPhys newTerrainPhys = null; ;
                 if (MegaRegionParentPhysicsScene == null)
                 {
-                    // BSTerrainPhys newTerrainPhys = new BSTerrainHeightmap(PhysicsScene, terrainRegionBase, id,
-                    //                                     heightMap, minCoords, maxCoords);
-                    BSTerrainPhys newTerrainPhys = new BSTerrainMesh(PhysicsScene, terrainRegionBase, id,
+                    // TODO: redo terrain implementation selection to be centralized (there is another
+                    //     use below) and to accept an asset specification (for a mesh).
+                    switch ((int)PhysicsScene.Params.terrainImplementation)
+                    {
+                        case (int)BSTerrainPhys.TerrainImplementation.Heightmap:
+                            newTerrainPhys = new BSTerrainHeightmap(PhysicsScene, terrainRegionBase, id,
+                                                        heightMap, minCoords, maxCoords);
+                            break;
+                        case (int)BSTerrainPhys.TerrainImplementation.Mesh:
+                            newTerrainPhys = new BSTerrainMesh(PhysicsScene, terrainRegionBase, id,
                                                         heightMap, minCoords, maxCoords);
+                            break;
+                        default:
+                            PhysicsScene.Logger.ErrorFormat("{0} Bad terrain implementation specified. type={1}/{2}",
+                                    LogHeader, (int)PhysicsScene.Params.terrainImplementation, PhysicsScene.Params.terrainImplementation);
+                            break;
+                    }
+
                     m_terrains.Add(terrainRegionBase, newTerrainPhys);
 
                     m_terrainModified = true;
@@ -292,8 +313,22 @@ public sealed class BSTerrainManager
             {
                 DetailLog("{0},UpdateTerrain:NewTerrain,taint,baseX={1},baseY={2}", 
                                             BSScene.DetailLogZero, minCoordsX.X, minCoordsX.Y);
-                BSTerrainPhys newTerrainPhys = new BSTerrainHeightmap(PhysicsScene, terrainRegionBase, 
-                                                newTerrainID, heightMapX, minCoordsX, maxCoordsX);
+                BSTerrainPhys newTerrainPhys = null;
+                switch ((int)PhysicsScene.Params.terrainImplementation)
+                {
+                    case (int)BSTerrainPhys.TerrainImplementation.Heightmap:
+                        newTerrainPhys = new BSTerrainHeightmap(PhysicsScene, terrainRegionBase, id,
+                                                    heightMap, minCoords, maxCoords);
+                        break;
+                    case (int)BSTerrainPhys.TerrainImplementation.Mesh:
+                        newTerrainPhys = new BSTerrainMesh(PhysicsScene, terrainRegionBase, id,
+                                                    heightMap, minCoords, maxCoords);
+                        break;
+                    default:
+                        PhysicsScene.Logger.ErrorFormat("{0} Bad terrain implementation specified. type={1}/{2}",
+                                    LogHeader, (int)PhysicsScene.Params.terrainImplementation, PhysicsScene.Params.terrainImplementation);
+                        break;
+                }
                 m_terrains.Add(terrainRegionBase, newTerrainPhys);
 
                 m_terrainModified = true;
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
index a2271a9..e218053 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs
@@ -283,6 +283,7 @@ public struct ConfigurationParameters
         public float ccdSweptSphereRadius;
     public float contactProcessingThreshold;
 
+    public float terrainImplementation;
     public float terrainFriction;
     public float terrainHitFraction;
     public float terrainRestitution;