aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
diff options
context:
space:
mode:
authorRobert Adams2013-07-23 08:13:01 -0700
committerRobert Adams2013-07-23 08:13:01 -0700
commitaec8852af793699a4c1093a38b992daf2dbd97f3 (patch)
tree8d628e8e17e0773fc2ee95e500a2ae919fcd6da9 /OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
parentRevert "Revert "Add experimental stubs for an extension function interface on... (diff)
downloadopensim-SC-aec8852af793699a4c1093a38b992daf2dbd97f3.zip
opensim-SC-aec8852af793699a4c1093a38b992daf2dbd97f3.tar.gz
opensim-SC-aec8852af793699a4c1093a38b992daf2dbd97f3.tar.bz2
opensim-SC-aec8852af793699a4c1093a38b992daf2dbd97f3.tar.xz
Revert "Revert "BulletSim: move collision processing for linksets from BSPrimLinkable""
Found that the vehicle movement problem was not caused by these physics changes. This reverts commit c45659863d8821a48a32e5b687c7b2a6d90b0300.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPrim.cs
index d43448e..4771934 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,6 +507,7 @@ public class BSPrim : BSPhysObject
507 } 507 }
508 return ret; 508 return ret;
509 } 509 }
510
510 public override int VehicleType { 511 public override int VehicleType {
511 get { 512 get {
512 int ret = (int)Vehicle.TYPE_NONE; 513 int ret = (int)Vehicle.TYPE_NONE;