diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Region/Physics/ChOdePlugin/ODECharacter.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
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 | ||