diff options
author | Robert Adams | 2013-09-11 16:48:15 -0700 |
---|---|---|
committer | Robert Adams | 2013-09-11 16:50:27 -0700 |
commit | dacc20ee48883efe3702c284edff5ee3fa0e96b0 (patch) | |
tree | 4d39afc14eb45335b3263687d6dae616f233612f /OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |
parent | Change handling of the FetchInventoryDescendents2 capability configuration to... (diff) | |
download | opensim-SC_OLD-dacc20ee48883efe3702c284edff5ee3fa0e96b0.zip opensim-SC_OLD-dacc20ee48883efe3702c284edff5ee3fa0e96b0.tar.gz opensim-SC_OLD-dacc20ee48883efe3702c284edff5ee3fa0e96b0.tar.bz2 opensim-SC_OLD-dacc20ee48883efe3702c284edff5ee3fa0e96b0.tar.xz |
BulletSim: remove collision cache clearing logic for physical objects.
This fixes constraints from getting messed up when properties change.
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 7 |
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 | ||