aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
index b105f77..563d527 100644
--- a/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEPrim.cs
@@ -1524,17 +1524,19 @@ namespace OpenSim.Region.Physics.OdePlugin
1524 { 1524 {
1525 prm.m_collisionCategories |= CollisionCategories.Body; 1525 prm.m_collisionCategories |= CollisionCategories.Body;
1526 prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind); 1526 prm.m_collisionFlags |= (CollisionCategories.Land | CollisionCategories.Wind);
1527 d.GeomEnable(prm.prim_geom);
1527 } 1528 }
1528 1529
1529 if (prm.m_NoColide) 1530 if (prm.m_NoColide)
1530 { 1531 {
1531 d.GeomSetCategoryBits(prm.prim_geom, 0); 1532 d.GeomSetCategoryBits(prm.prim_geom, 0);
1532 d.GeomSetCollideBits(prm.prim_geom, (int)CollisionCategories.Land); 1533 d.GeomSetCollideBits(prm.prim_geom, (int)CollisionCategories.Land);
1534 d.GeomEnable(prm.prim_geom);
1533 } 1535 }
1534 else 1536 else
1535 { 1537 {
1536 d.GeomSetCategoryBits(prm.prim_geom, (int)m_collisionCategories); 1538 d.GeomSetCategoryBits(prm.prim_geom, (int)prm.m_collisionCategories);
1537 d.GeomSetCollideBits(prm.prim_geom, (int)m_collisionFlags); 1539 d.GeomSetCollideBits(prm.prim_geom, (int)prm.m_collisionFlags);
1538 } 1540 }
1539 prm.m_collisionscore = 0; 1541 prm.m_collisionscore = 0;
1540 1542