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/OdePlugin/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 'OpenSim/Region/Physics/OdePlugin/ODEPrim.cs')
| -rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index f354328..9ef2e9c 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -2365,6 +2365,11 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2365 | 2365 | ||
| 2366 | } | 2366 | } |
| 2367 | 2367 | ||
| 2368 | public override void VehicleFlags(int param, bool remove) | ||
| 2369 | { | ||
| 2370 | m_vehicle.ProcessVehicleFlags(param, remove); | ||
| 2371 | } | ||
| 2372 | |||
| 2368 | public override void SetVolumeDetect(int param) | 2373 | public override void SetVolumeDetect(int param) |
| 2369 | { | 2374 | { |
| 2370 | lock (_parent_scene.OdeLock) | 2375 | lock (_parent_scene.OdeLock) |