diff options
author | Robert Adams | 2013-07-22 12:09:17 -0700 |
---|---|---|
committer | Robert Adams | 2013-07-22 12:09:17 -0700 |
commit | c45659863d8821a48a32e5b687c7b2a6d90b0300 (patch) | |
tree | ab9dcd8912dd1b339e70e6de22784d1db90fb9f3 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |
parent | Revert "BulletSim: only create vehicle prim actor when vehicles are enabled." (diff) | |
download | opensim-SC-c45659863d8821a48a32e5b687c7b2a6d90b0300.zip opensim-SC-c45659863d8821a48a32e5b687c7b2a6d90b0300.tar.gz opensim-SC-c45659863d8821a48a32e5b687c7b2a6d90b0300.tar.bz2 opensim-SC-c45659863d8821a48a32e5b687c7b2a6d90b0300.tar.xz |
Revert "BulletSim: move collision processing for linksets from BSPrimLinkable"
The changes don't seem to be ready for prime time.
This reverts commit b4c3a791aa55390bff071b3fe4bbe70c1d252703.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs index 4771934..d43448e 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs | |||
@@ -495,8 +495,8 @@ public class BSPrim : BSPhysObject | |||
495 | } | 495 | } |
496 | } | 496 | } |
497 | 497 | ||
498 | // Find and return a handle to the current vehicle actor. | 498 | // Find and return a handle to the current vehicle actor. |
499 | // Return 'null' if there is no vehicle actor. | 499 | // Return 'null' if there is no vehicle actor. |
500 | public BSDynamics GetVehicleActor() | 500 | public BSDynamics GetVehicleActor() |
501 | { | 501 | { |
502 | BSDynamics ret = null; | 502 | BSDynamics ret = null; |
@@ -507,7 +507,6 @@ public class BSPrim : BSPhysObject | |||
507 | } | 507 | } |
508 | return ret; | 508 | return ret; |
509 | } | 509 | } |
510 | |||
511 | public override int VehicleType { | 510 | public override int VehicleType { |
512 | get { | 511 | get { |
513 | int ret = (int)Vehicle.TYPE_NONE; | 512 | int ret = (int)Vehicle.TYPE_NONE; |