diff options
| author | Melanie | 2010-02-15 00:20:48 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-15 00:20:48 +0000 |
| commit | c033223c63274ebe41075b24d108ca952fbd242c (patch) | |
| tree | 8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |
| parent | Extraneous debug messages removed (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.zip opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2 opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz | |
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs')
| -rw-r--r-- | OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs index 24eb6b1..dd2c686 100644 --- a/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs +++ b/OpenSim/Region/Physics/PhysXPlugin/PhysXPlugin.cs | |||
| @@ -371,6 +371,8 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
| 371 | 371 | ||
| 372 | } | 372 | } |
| 373 | 373 | ||
| 374 | public override void VehicleFlags(int param, bool remove) { } | ||
| 375 | |||
| 374 | public override void SetVolumeDetect(int param) | 376 | public override void SetVolumeDetect(int param) |
| 375 | { | 377 | { |
| 376 | 378 | ||
| @@ -775,6 +777,8 @@ namespace OpenSim.Region.Physics.PhysXPlugin | |||
| 775 | 777 | ||
| 776 | } | 778 | } |
| 777 | 779 | ||
| 780 | public override void VehicleFlags(int param, bool remove) { } | ||
| 781 | |||
| 778 | public override void SetVolumeDetect(int param) | 782 | public override void SetVolumeDetect(int param) |
| 779 | { | 783 | { |
| 780 | 784 | ||