aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
diff options
context:
space:
mode:
authorMelanie2010-01-21 23:48:11 +0000
committerMelanie2010-01-21 23:48:11 +0000
commitd2e17f4ffb3bbd4e377152bef097d47d481c6c5c (patch)
tree82603908ff006d9c61d28c56ea8b5296933223fc /OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
parentMerge branch 'master' into careminster (diff)
parentAdd glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associat... (diff)
downloadopensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.zip
opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.gz
opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.bz2
opensim-SC-d2e17f4ffb3bbd4e377152bef097d47d481c6c5c.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs')
-rw-r--r--OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
index 6e6b44f..29a3dd9 100644
--- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
@@ -2415,7 +2415,17 @@ Console.WriteLine(" JointCreateFixed");
2415 { 2415 {
2416 m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation); 2416 m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation);
2417 } 2417 }
2418 2418
2419 public override void VehicleFlagsSet(int flags)
2420 {
2421 m_vehicle.ProcessFlagsVehicleSet(flags);
2422 }
2423
2424 public override void VehicleFlagsRemove(int flags)
2425 {
2426 m_vehicle.ProcessFlagsVehicleRemove(flags);
2427 }
2428
2419 public override void SetVolumeDetect(int param) 2429 public override void SetVolumeDetect(int param)
2420 { 2430 {
2421 lock (_parent_scene.OdeLock) 2431 lock (_parent_scene.OdeLock)