OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '5515c45e3b42497f64f8e5846697471b1de952c5' into bigmerge

avinationmerge
Melanie 2011-10-25 02:55:14 +01:00
parent 7ac9463e35 5515c45e3b
commit 43751d0cfd
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -2378,6 +2378,8 @@ Console.WriteLine(" JointCreateFixed");
public override void SetVolumeDetect(int param) public override void SetVolumeDetect(int param)
{ {
// We have to lock the scene here so that an entire simulate loop either uses volume detect for all
// possible collisions with this prim or for none of them.
lock (_parent_scene.OdeLock) lock (_parent_scene.OdeLock)
{ {
m_isVolumeDetect = (param != 0); m_isVolumeDetect = (param != 0);

2
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
View File

@ -3679,8 +3679,8 @@ Console.WriteLine("AddPhysicsActorTaint to " + taintedprim.Name);
{ {
d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water)); d.GeomSetCategoryBits(WaterGeom, (int)(CollisionCategories.Water));
d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space)); d.GeomSetCollideBits(WaterGeom, (int)(CollisionCategories.Space));
} }
geom_name_map[WaterGeom] = "Water"; geom_name_map[WaterGeom] = "Water";
d.Matrix3 R = new d.Matrix3(); d.Matrix3 R = new d.Matrix3();