diff options
author | Melanie | 2010-01-21 23:48:11 +0000 |
---|---|---|
committer | Melanie | 2010-01-21 23:48:11 +0000 |
commit | d2e17f4ffb3bbd4e377152bef097d47d481c6c5c (patch) | |
tree | 82603908ff006d9c61d28c56ea8b5296933223fc /OpenSim/Region/Physics/PhysXPlugin | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Add glue for llSetVehicleFlags(), llRemoveVehicleFlags(). ChODE: Add associat... (diff) | |
download | opensim-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/PhysXPlugin')
-rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 24eb6b1..e54065c 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
@@ -370,7 +370,17 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
370 | { | 370 | { |
371 | 371 | ||
372 | } | 372 | } |
373 | |||
374 | public override void VehicleFlagsSet(int flags) | ||
375 | { | ||
376 | |||
377 | } | ||
378 | |||
379 | public override void VehicleFlagsRemove(int flags) | ||
380 | { | ||
373 | 381 | ||
382 | } | ||
383 | |||
374 | public override void SetVolumeDetect(int param) | 384 | public override void SetVolumeDetect(int param) |
375 | { | 385 | { |
376 | 386 | ||
@@ -774,7 +784,17 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
774 | { | 784 | { |
775 | 785 | ||
776 | } | 786 | } |
787 | |||
788 | public override void VehicleFlagsSet(int flags) | ||
789 | { | ||
790 | |||
791 | } | ||
792 | |||
793 | public override void VehicleFlagsRemove(int flags) | ||
794 | { | ||
777 | 795 | ||
796 | } | ||
797 | |||
778 | public override void SetVolumeDetect(int param) | 798 | public override void SetVolumeDetect(int param) |
779 | { | 799 | { |
780 | 800 | ||