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/ODEPrim.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/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..0eb9bb5 100644 --- a/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs | |||
| @@ -2426,6 +2426,14 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2426 | m_vehicle.ProcessFlagsVehicleRemove(flags); | 2426 | m_vehicle.ProcessFlagsVehicleRemove(flags); |
| 2427 | } | 2427 | } |
| 2428 | 2428 | ||
| 2429 | public override void VehicleFlags(int flags, bool remove) | ||
| 2430 | { | ||
| 2431 | if (!remove) | ||
| 2432 | m_vehicle.ProcessFlagsVehicleSet(flags); | ||
| 2433 | else | ||
| 2434 | m_vehicle.ProcessFlagsVehicleRemove(flags); | ||
| 2435 | } | ||
| 2436 | |||
| 2429 | public override void SetVolumeDetect(int param) | 2437 | public override void SetVolumeDetect(int param) |
| 2430 | { | 2438 | { |
| 2431 | lock (_parent_scene.OdeLock) | 2439 | lock (_parent_scene.OdeLock) |