diff options
author | Robert Adams | 2012-11-03 21:08:39 -0700 |
---|---|---|
committer | Robert Adams | 2012-11-03 21:16:02 -0700 |
commit | 79f7c466a116bf368423d4e18163f34fd8d66ce1 (patch) | |
tree | 8acd97fa89b1d900f785cec052fedfac7dde6027 /OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |
parent | BulletSim: search the mesh and hull lists to find shapes if type is not known... (diff) | |
download | opensim-SC_OLD-79f7c466a116bf368423d4e18163f34fd8d66ce1.zip opensim-SC_OLD-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.gz opensim-SC_OLD-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.bz2 opensim-SC_OLD-79f7c466a116bf368423d4e18163f34fd8d66ce1.tar.xz |
BulletSim: fix compound linkset crash by not freeing shape of child prims.
Remove all compilation warnings (mostly 'protected' in sealed classes.)
Add the dynamicAabbEnable parameter to creation of compound shapes.
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSScene.cs')
-rw-r--r-- | OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs index c2e0ef1..740f339 100644 --- a/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSScene.cs | |||
@@ -1391,7 +1391,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
1391 | // If the local ID is APPLY_TO_NONE, just change the default value | 1391 | // If the local ID is APPLY_TO_NONE, just change the default value |
1392 | // If the localID is APPLY_TO_ALL change the default value and apply the new value to all the lIDs | 1392 | // If the localID is APPLY_TO_ALL change the default value and apply the new value to all the lIDs |
1393 | // If the localID is a specific object, apply the parameter change to only that object | 1393 | // If the localID is a specific object, apply the parameter change to only that object |
1394 | protected void UpdateParameterObject(ref float defaultLoc, string parm, uint localID, float val) | 1394 | private void UpdateParameterObject(ref float defaultLoc, string parm, uint localID, float val) |
1395 | { | 1395 | { |
1396 | List<uint> objectIDs = new List<uint>(); | 1396 | List<uint> objectIDs = new List<uint>(); |
1397 | switch (localID) | 1397 | switch (localID) |
@@ -1416,7 +1416,7 @@ public sealed class BSScene : PhysicsScene, IPhysicsParameters | |||
1416 | } | 1416 | } |
1417 | 1417 | ||
1418 | // schedule the actual updating of the paramter to when the phys engine is not busy | 1418 | // schedule the actual updating of the paramter to when the phys engine is not busy |
1419 | protected void TaintedUpdateParameter(string parm, List<uint> lIDs, float val) | 1419 | private void TaintedUpdateParameter(string parm, List<uint> lIDs, float val) |
1420 | { | 1420 | { |
1421 | float xval = val; | 1421 | float xval = val; |
1422 | List<uint> xlIDs = lIDs; | 1422 | List<uint> xlIDs = lIDs; |