diff options
author | Melanie | 2010-03-06 12:24:09 +0000 |
---|---|---|
committer | Melanie | 2010-03-06 12:24:09 +0000 |
commit | 1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90 (patch) | |
tree | 69419084feb98d59888b59a643e5fa062314605d /OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |
parent | Remove a superfluous array creation (diff) | |
parent | - implementing server 1.38 functions (diff) | |
download | opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.zip opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.gz opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.bz2 opensim-SC-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.xz |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs index 2eb519f..6dadbe5 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |||
@@ -734,6 +734,10 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
734 | 734 | ||
735 | } | 735 | } |
736 | 736 | ||
737 | public override void VehicleFlags(int flags, bool remove) | ||
738 | { | ||
739 | } | ||
740 | |||
737 | public override void VehicleFlagsSet(int flags) | 741 | public override void VehicleFlagsSet(int flags) |
738 | { | 742 | { |
739 | 743 | ||