diff options
Diffstat (limited to 'OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs')
-rwxr-xr-x[-rw-r--r--] | OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs b/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs index 8312239..13c1361 100644..100755 --- a/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs +++ b/OpenSim/Region/PhysicsModules/BulletS/BSLinkset.cs | |||
@@ -257,7 +257,7 @@ public abstract class BSLinkset | |||
257 | // Return 'true' if linkset processed the collision. 'false' says the linkset didn't have | 257 | // Return 'true' if linkset processed the collision. 'false' says the linkset didn't have |
258 | // anything to add for the collision and it should be passed through normal processing. | 258 | // anything to add for the collision and it should be passed through normal processing. |
259 | // Default processing for a linkset. | 259 | // Default processing for a linkset. |
260 | public virtual bool HandleCollide(uint collidingWith, BSPhysObject collidee, | 260 | public virtual bool HandleCollide(BSPhysObject collider, BSPhysObject collidee, |
261 | OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth) | 261 | OMV.Vector3 contactPoint, OMV.Vector3 contactNormal, float pentrationDepth) |
262 | { | 262 | { |
263 | bool ret = false; | 263 | bool ret = false; |
@@ -319,7 +319,7 @@ public abstract class BSLinkset | |||
319 | public virtual bool AllPartsComplete | 319 | public virtual bool AllPartsComplete |
320 | { | 320 | { |
321 | get { | 321 | get { |
322 | bool ret = true; | 322 | bool ret = true; |
323 | this.ForEachMember((member) => | 323 | this.ForEachMember((member) => |
324 | { | 324 | { |
325 | if ((!member.IsInitialized) || member.IsIncomplete || member.PrimAssetState == BSPhysObject.PrimAssetCondition.Waiting) | 325 | if ((!member.IsInitialized) || member.IsIncomplete || member.PrimAssetState == BSPhysObject.PrimAssetCondition.Waiting) |