diff options
author | Justin Clark-Casey (justincc) | 2011-10-18 20:56:11 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-10-18 20:56:11 +0100 |
commit | 5515c45e3b42497f64f8e5846697471b1de952c5 (patch) | |
tree | 9c6e81cac687df800a9ae1a7d41030eed95fce79 /OpenSim/Region/Physics/OdePlugin | |
parent | Remove the unused CollisionLocker from ODE (diff) | |
download | opensim-SC-5515c45e3b42497f64f8e5846697471b1de952c5.zip opensim-SC-5515c45e3b42497f64f8e5846697471b1de952c5.tar.gz opensim-SC-5515c45e3b42497f64f8e5846697471b1de952c5.tar.bz2 opensim-SC-5515c45e3b42497f64f8e5846697471b1de952c5.tar.xz |
minor: method doc to explain a lock of OdeLock
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdeScene.cs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs index 447304b..1b9378a 100644 --- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs +++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs | |||
@@ -2378,6 +2378,8 @@ Console.WriteLine(" JointCreateFixed"); | |||
2378 | 2378 | ||
2379 | public override void SetVolumeDetect(int param) | 2379 | public override void SetVolumeDetect(int param) |
2380 | { | 2380 | { |
2381 | // We have to lock the scene here so that an entire simulate loop either uses volume detect for all | ||
2382 | // possible collisions with this prim or for none of them. | ||
2381 | lock (_parent_scene.OdeLock) | 2383 | lock (_parent_scene.OdeLock) |
2382 | { | 2384 | { |
2383 | m_isVolumeDetect = (param != 0); | 2385 | m_isVolumeDetect = (param != 0); |
diff --git a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs index 03ff6d8..9b503fc 100644 --- a/OpenSim/Region/Physics/OdePlugin/OdeScene.cs +++ b/OpenSim/Region/Physics/OdePlugin/OdeScene.cs | |||
@@ -3679,8 +3679,8 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name); | |||
3679 | { | 3679 | { |
3680 | d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water)); | 3680 | d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water)); |
3681 | d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space)); | 3681 | d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space)); |
3682 | |||
3683 | } | 3682 | } |
3683 | |||
3684 | geom_name_map[WaterGeom] = "Water"; | 3684 | geom_name_map[WaterGeom] = "Water"; |
3685 | 3685 | ||
3686 | d.Matrix3 R = new d.Matrix3(); | 3686 | d.Matrix3 R = new d.Matrix3(); |