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/OdePlugin/ODEPrim.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/OdePlugin/ODEPrim.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index f354328..39cfa49 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2357,12 +2357,17 @@ Console.WriteLine(" JointCreateFixed"); | |||
2357 | 2357 | ||
2358 | public override void VehicleFlagsSet(int flags) | 2358 | public override void VehicleFlagsSet(int flags) |
2359 | { | 2359 | { |
2360 | 2360 | VehicleFlags(flags, false); | |
2361 | } | 2361 | } |
2362 | 2362 | ||
2363 | public override void VehicleFlagsRemove(int flags) | 2363 | public override void VehicleFlagsRemove(int flags) |
2364 | { | 2364 | { |
2365 | VehicleFlags(flags, true); | ||
2366 | } | ||
2365 | 2367 | ||
2368 | public override void VehicleFlags(int param, bool remove) | ||
2369 | { | ||
2370 | m_vehicle.ProcessVehicleFlags(param, remove); | ||
2366 | } | 2371 | } |
2367 | 2372 | ||
2368 | public override void SetVolumeDetect(int param) | 2373 | public override void SetVolumeDetect(int param) |