From 674be7222568ff719f082564d02cb68811adcd7f Mon Sep 17 00:00:00 2001
From: Robert Adams
Date: Thu, 21 Aug 2014 06:33:04 -0700
Subject: BulletSim: add new Bullet 2.82 constraint type codes and rename the
 BulletSim fixed constraint to not be confused with the native version.

---
 OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs')

diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
index be6f152..0458cd9 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSApiTemplate.cs
@@ -43,9 +43,11 @@ public enum ConstraintType : int
 	SLIDER_CONSTRAINT_TYPE,
 	CONTACT_CONSTRAINT_TYPE,
 	D6_SPRING_CONSTRAINT_TYPE,
+	GEAR_CONSTRAINT_TYPE,           // added in Bullet 2.82
+	FIXED_CONSTRAINT_TYPE,          // added in Bullet 2.82
 	MAX_CONSTRAINT_TYPE,            // last type defined by Bullet
     //
-    FIXED_CONSTRAINT_TYPE = 1234    // BulletSim constraint that is fixed and unmoving
+    BS_FIXED_CONSTRAINT_TYPE = 1234    // BulletSim constraint that is fixed and unmoving
 }
 
 // ===============================================================================
-- 
cgit v1.1