diff options
Diffstat (limited to 'OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs')
-rw-r--r-- | OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs index 9bf3667..702c336 100644 --- a/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs +++ b/OpenSim/Region/Physics/UbitOdePlugin/ODEMeshWorker.cs | |||
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
304 | if (GetTriMeshGeo(repData)) | 304 | if (GetTriMeshGeo(repData)) |
305 | hasMesh = true; | 305 | hasMesh = true; |
306 | else | 306 | else |
307 | repData.canColide = false; | 307 | repData.NoColide = true; |
308 | } | 308 | } |
309 | 309 | ||
310 | if (!hasMesh) | 310 | if (!hasMesh) |
@@ -350,6 +350,15 @@ namespace OpenSim.Region.Physics.OdePlugin | |||
350 | return repData; | 350 | return repData; |
351 | } | 351 | } |
352 | 352 | ||
353 | public void ChangeActorPhysRep(PhysicsActor actor, PrimitiveBaseShape pbs, | ||
354 | Vector3 size, byte shapetype, MeshWorkerChange what) | ||
355 | { | ||
356 | ODEPhysRepData repData = CreateActorPhysRep(actor, pbs, null, size, shapetype); | ||
357 | repData.changed |= what; | ||
358 | if (repData != null && actor != null) | ||
359 | ((OdePrim)actor).AddChange(changes.PhysRepData, repData); | ||
360 | } | ||
361 | |||
353 | private void CalculateBasicPrimVolume(ODEPhysRepData repData) | 362 | private void CalculateBasicPrimVolume(ODEPhysRepData repData) |
354 | { | 363 | { |
355 | PrimitiveBaseShape _pbs = repData.pbs; | 364 | PrimitiveBaseShape _pbs = repData.pbs; |