From 45f37e11ad6e9a9917a6ea07ec52dec9058393f0 Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Mon, 13 May 2013 08:40:24 -0700
Subject: BulletSim: use heightmap terrain when using BulletXNA. Output
 messages on features disabled when using BulletXNA.

---
 OpenSim/Region/Physics/BulletSPlugin/BSParam.cs | 2 +-
 OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
index 3ca7e16..5504478 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
@@ -90,7 +90,7 @@ public static class BSParam
     public static bool ShouldUseBulletHACD { get; set; }
     public static bool ShouldUseSingleConvexHullForPrims { get; set; }
 
-    public static float TerrainImplementation { get; private set; }
+    public static float TerrainImplementation { get; set; }
     public static int TerrainMeshMagnification { get; private set; }
     public static float TerrainFriction { get; private set; }
     public static float TerrainHitFraction { get; private set; }
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
index a4a8794..3f407ce 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -318,8 +318,12 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters
                 ret = new BSAPIXNA(engineName, this);
                 // Disable some features that are not implemented in BulletXNA
                 m_log.InfoFormat("{0} Disabling some physics features not implemented by BulletXNA", LogHeader);
+                m_log.InfoFormat("{0}    Disabling ShouldUseBulletHACD", LogHeader);
                 BSParam.ShouldUseBulletHACD = false;
+                m_log.InfoFormat("{0}    Disabling ShouldUseSingleConvexHullForPrims", LogHeader);
                 BSParam.ShouldUseSingleConvexHullForPrims = false;
+                m_log.InfoFormat("{0}    Setting terrain implimentation to Heightmap", LogHeader);
+                BSParam.TerrainImplementation = (float)BSTerrainPhys.TerrainImplementation.Heightmap;
                 break;
         }
 
-- 
cgit v1.1