aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-10-25 02:55:14 +0100
committerMelanie2011-10-25 02:55:14 +0100
commit43751d0cfdcb4ccb5789ad02f67fde628a4a7a59 (patch)
tree5bac78190520b06a65a128225aa1ea72900e2e45 /OpenSim
parentMerge commit '71d221cdc090cdedf371ead534421bb7074908cd' into bigmerge (diff)
parentminor: method doc to explain a lock of OdeLock (diff)
downloadopensim-SC_OLD-43751d0cfdcb4ccb5789ad02f67fde628a4a7a59.zip
opensim-SC_OLD-43751d0cfdcb4ccb5789ad02f67fde628a4a7a59.tar.gz
opensim-SC_OLD-43751d0cfdcb4ccb5789ad02f67fde628a4a7a59.tar.bz2
opensim-SC_OLD-43751d0cfdcb4ccb5789ad02f67fde628a4a7a59.tar.xz
Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdeScene.cs2
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index 8a90b48..29bdd21 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();