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/OdePlugin/ODECharacter.cs | |
| parent | Dynamics Integration Part 1 (diff) | |
| parent | Small consistency change (diff) | |
| download | opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2 opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz | |
Resolved merge
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs index b713142..2a66060 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs | |||
| @@ -733,17 +733,12 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
| 733 | { | 733 | { |
| 734 | 734 | ||
| 735 | } | 735 | } |
| 736 | |||
| 737 | public override void VehicleFlagsSet(int flags) | ||
| 738 | { | ||
| 739 | 736 | ||
| 740 | } | 737 | public override void VehicleFlags(int param, bool remove) |
| 741 | |||
| 742 | public override void VehicleFlagsRemove(int flags) | ||
| 743 | { | 738 | { |
| 744 | 739 | ||
| 745 | } | 740 | } |
| 746 | 741 | ||
| 747 | public override void SetVolumeDetect(int param) | 742 | public override void SetVolumeDetect(int param) |
| 748 | { | 743 | { |
| 749 | 744 | ||