diff options
| author | Melanie | 2012-12-30 03:43:51 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-30 03:43:51 +0000 |
| commit | 7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5 (patch) | |
| tree | e2b5b94a95511a6e26c56b611e7b7445c28d119f /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: remove check for small motor movement because, while it (diff) | |
| download | opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.zip opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.gz opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.bz2 opensim-SC-7e98dfd70b5c6fe17fec8380f9ce854c6c9c45f5.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index eb4d039..b361498 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -69,6 +69,7 @@ public enum BSPhysicsShapeType | |||
| 69 | SHAPE_TERRAIN = 21, | 69 | SHAPE_TERRAIN = 21, |
| 70 | SHAPE_COMPOUND = 22, | 70 | SHAPE_COMPOUND = 22, |
| 71 | SHAPE_HEIGHTMAP = 23, | 71 | SHAPE_HEIGHTMAP = 23, |
| 72 | SHAPE_AVATAR = 24, | ||
| 72 | }; | 73 | }; |
| 73 | 74 | ||
| 74 | // The native shapes have predefined shape hash keys | 75 | // The native shapes have predefined shape hash keys |
| @@ -80,6 +81,7 @@ public enum FixedShapeKey : ulong | |||
| 80 | KEY_CONE = 3, | 81 | KEY_CONE = 3, |
| 81 | KEY_CYLINDER = 4, | 82 | KEY_CYLINDER = 4, |
| 82 | KEY_CAPSULE = 5, | 83 | KEY_CAPSULE = 5, |
| 84 | KEY_AVATAR = 6, | ||
| 83 | } | 85 | } |
| 84 | 86 | ||
| 85 | [StructLayout(LayoutKind.Sequential)] | 87 | [StructLayout(LayoutKind.Sequential)] |