diff options
author | Kitto Flora | 2010-03-12 13:48:31 -0500 |
---|---|---|
committer | Kitto Flora | 2010-03-12 13:48:31 -0500 |
commit | 7bd48d383d3383c1e633f76f76a5291f4224d48a (patch) | |
tree | 18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |
parent | Dynamics Integration Part 1 (diff) | |
parent | Small consistency change (diff) | |
download | opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2 opensim-SC_OLD-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz |
Resolved merge
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs index 2eb519f..8e87ad9 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |||
@@ -734,16 +734,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
734 | 734 | ||
735 | } | 735 | } |
736 | 736 | ||
737 | public override void VehicleFlagsSet(int flags) | 737 | public override void VehicleFlags(int flags, bool remove) |
738 | { | 738 | { |
739 | |||
740 | } | 739 | } |
741 | |||
742 | public override void VehicleFlagsRemove(int flags) | ||
743 | { | ||
744 | 740 | ||
745 | } | ||
746 | |||
747 | public override void SetVolumeDetect(int param) | 741 | public override void SetVolumeDetect(int param) |
748 | { | 742 | { |
749 | 743 | ||