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/ODEPrim.cs | |
| parent | Remove a superfluous array creation (diff) | |
| parent | - implementing server 1.38 functions (diff) | |
| download | opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.zip opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.gz opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.bz2 opensim-SC_OLD-1f7a0cf892bf23c5b8ba8e3ae1a9036de428db90.tar.xz | |
Merge branch '0.6.9-post-fixes' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs index 8502aef..c2a6a9b 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -2416,6 +2416,14 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2416 | m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation); | 2416 | m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation); |
| 2417 | } | 2417 | } |
| 2418 | 2418 | ||
| 2419 | public override void VehicleFlags(int flags, bool remove) | ||
| 2420 | { | ||
| 2421 | if (!remove) | ||
| 2422 | VehicleFlagsSet(flags); | ||
| 2423 | else | ||
| 2424 | VehicleFlagsRemove(flags); | ||
| 2425 | } | ||
| 2426 | |||
| 2419 | public override void VehicleFlagsSet(int flags) | 2427 | public override void VehicleFlagsSet(int flags) |
| 2420 | { | 2428 | { |
| 2421 | m_vehicle.ProcessFlagsVehicleSet(flags); | 2429 | m_vehicle.ProcessFlagsVehicleSet(flags); |