diff options
| author | Melanie | 2010-02-15 00:20:48 +0000 |
|---|---|---|
| committer | Melanie | 2010-02-15 00:20:48 +0000 |
| commit | c033223c63274ebe41075b24d108ca952fbd242c (patch) | |
| tree | 8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |
| parent | Extraneous debug messages removed (diff) | |
| parent | Plug a small hole (diff) | |
| download | opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.zip opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2 opensim-SC_OLD-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz | |
Merge branch 'master' into presence-refactor
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 44b2727..03736d1 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
| @@ -2355,6 +2355,11 @@ Console.WriteLine(" JointCreateFixed"); | |||
| 2355 | m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation); | 2355 | m_vehicle.ProcessRotationVehicleParam((Vehicle) param, rotation); |
| 2356 | } | 2356 | } |
| 2357 | 2357 | ||
| 2358 | public override void VehicleFlags(int param, bool remove) | ||
| 2359 | { | ||
| 2360 | m_vehicle.ProcessVehicleFlags(param, remove); | ||
| 2361 | } | ||
| 2362 | |||
| 2358 | public override void SetVolumeDetect(int param) | 2363 | public override void SetVolumeDetect(int param) |
| 2359 | { | 2364 | { |
| 2360 | lock (_parent_scene.OdeLock) | 2365 | lock (_parent_scene.OdeLock) |