aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
diff options
context:
space:
mode:
authorTeravus Ovares2009-04-16 07:31:48 +0000
committerTeravus Ovares2009-04-16 07:31:48 +0000
commiteac5d4015d8f76d883cfa0c19fc66633de5032dc (patch)
treeffb39cf0f472fe6cef98e94200a16931422d2d18 /OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
parentCorrectly flag group owned prims in the land prim list (diff)
downloadopensim-SC_OLD-eac5d4015d8f76d883cfa0c19fc66633de5032dc.zip
opensim-SC_OLD-eac5d4015d8f76d883cfa0c19fc66633de5032dc.tar.gz
opensim-SC_OLD-eac5d4015d8f76d883cfa0c19fc66633de5032dc.tar.bz2
opensim-SC_OLD-eac5d4015d8f76d883cfa0c19fc66633de5032dc.tar.xz
* Committing more BulletDotNETPlugin work
* Tweak the LLSetStatus results in the ODEPlugin. Hopefully it's a little less unstable. * ODEPlugin is using experimental math for LLSetStatus, use with caution! :)
Diffstat (limited to 'OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs')
-rw-r--r--OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
index a2caeac..5ff73c5 100644
--- a/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
+++ b/OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETPrim.cs
@@ -1289,7 +1289,7 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
1289 } 1289 }
1290 else 1290 else
1291 { 1291 {
1292 Body.setCollisionFlags(0); 1292 Body.setCollisionFlags(0 | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK);
1293 enableBodySoft(); 1293 enableBodySoft();
1294 } 1294 }
1295 m_isSelected = m_taintselected; 1295 m_isSelected = m_taintselected;
@@ -2140,6 +2140,8 @@ namespace OpenSim.Region.Physics.BulletDotNETPlugin
2140 ((btGImpactMeshShape) prim_geom).setLocalScaling(new btVector3(1, 1, 1)); 2140 ((btGImpactMeshShape) prim_geom).setLocalScaling(new btVector3(1, 1, 1));
2141 ((btGImpactMeshShape) prim_geom).updateBound(); 2141 ((btGImpactMeshShape) prim_geom).updateBound();
2142 } 2142 }
2143 Body.setCollisionFlags(Body.getCollisionFlags() | (int)ContactFlags.CF_CUSTOM_MATERIAL_CALLBACK);
2144 Body.setUserPointer((IntPtr) m_localID);
2143 _parent_scene.AddPrimToScene(this); 2145 _parent_scene.AddPrimToScene(this);
2144 } 2146 }
2145 else 2147 else