aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics
diff options
context:
space:
mode:
authorRobert Adams2013-09-11 16:48:15 -0700
committerJustin Clark-Casey (justincc)2013-09-20 21:04:18 +0100
commit10152815ac8f15091720783b0bd4473f41af0d6b (patch)
tree3d1afebb07df8a887ccf63750e81fc61c3185b06 /OpenSim/Region/Physics
parentChange handling of the FetchInventoryDescendents2 capability configuration to... (diff)
downloadopensim-SC_OLD-10152815ac8f15091720783b0bd4473f41af0d6b.zip
opensim-SC_OLD-10152815ac8f15091720783b0bd4473f41af0d6b.tar.gz
opensim-SC_OLD-10152815ac8f15091720783b0bd4473f41af0d6b.tar.bz2
opensim-SC_OLD-10152815ac8f15091720783b0bd4473f41af0d6b.tar.xz
BulletSim: remove collision cache clearing logic for physical objects.
This fixes constraints from getting messed up when properties change.
Diffstat (limited to 'OpenSim/Region/Physics')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
index 47df611..f89b376 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
@@ -302,13 +302,16 @@ public abstract class BSPhysObject : PhysicsActor
302 { 302 {
303 if (PhysBody.HasPhysicalBody) 303 if (PhysBody.HasPhysicalBody)
304 { 304 {
305 // Clear the collision cache since we've changed some properties.
306 PhysScene.PE.ClearCollisionProxyCache(PhysScene.World, PhysBody);
307 if (IsPhysical) 305 if (IsPhysical)
308 { 306 {
309 // Physical objects might need activating 307 // Physical objects might need activating
310 PhysScene.PE.Activate(PhysBody, forceIt); 308 PhysScene.PE.Activate(PhysBody, forceIt);
311 } 309 }
310 else
311 {
312 // Clear the collision cache since we've changed some properties.
313 PhysScene.PE.ClearCollisionProxyCache(PhysScene.World, PhysBody);
314 }
312 } 315 }
313 } 316 }
314 317