diff options
| author | Melanie | 2012-12-07 03:49:04 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-07 03:49:04 +0000 |
| commit | 2cb824d3fcd37b9f9c9a9981702b81643c531a1b (patch) | |
| tree | 8bfb77166642a49f142e60a3486a264e7635ef83 /OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.zip opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.gz opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.bz2 opensim-SC_OLD-2cb824d3fcd37b9f9c9a9981702b81643c531a1b.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs index a5acfd1..2671995 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BulletSimAPI.cs | |||
| @@ -360,6 +360,7 @@ public enum CollisionFlags : uint | |||
| 360 | // Following used by BulletSim to control collisions and updates | 360 | // Following used by BulletSim to control collisions and updates |
| 361 | BS_SUBSCRIBE_COLLISION_EVENTS = 1 << 10, | 361 | BS_SUBSCRIBE_COLLISION_EVENTS = 1 << 10, |
| 362 | BS_FLOATS_ON_WATER = 1 << 11, | 362 | BS_FLOATS_ON_WATER = 1 << 11, |
| 363 | BS_VEHICLE_COLLISIONS = 1 << 12, | ||
| 363 | BS_NONE = 0, | 364 | BS_NONE = 0, |
| 364 | BS_ALL = 0xFFFFFFFF, | 365 | BS_ALL = 0xFFFFFFFF, |
| 365 | 366 | ||