aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs')
-rwxr-xr-xOpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
index 648910a..dee6243 100755
--- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
@@ -120,25 +120,25 @@ public class BSShapeCollection : IDisposable
120 // Track another user of a body 120 // Track another user of a body
121 // We presume the caller has allocated the body. 121 // We presume the caller has allocated the body.
122 // Bodies only have one user so the reference count is either 1 or 0. 122 // Bodies only have one user so the reference count is either 1 or 0.
123 public void ReferenceBody(BulletBody shape, bool atTaintTime) 123 public void ReferenceBody(BulletBody body, bool atTaintTime)
124 { 124 {
125 lock (m_collectionActivityLock) 125 lock (m_collectionActivityLock)
126 { 126 {
127 BodyDesc bodyDesc; 127 BodyDesc bodyDesc;
128 if (Bodies.TryGetValue(shape.ID, out bodyDesc)) 128 if (Bodies.TryGetValue(body.ID, out bodyDesc))
129 { 129 {
130 bodyDesc.referenceCount++; 130 bodyDesc.referenceCount++;
131 DetailLog("{0},BSShapeCollection.ReferenceBody,existingBody,ref={1}", shape.ID, bodyDesc.referenceCount); 131 DetailLog("{0},BSShapeCollection.ReferenceBody,existingBody,body={1},ref={2}", body.ID, body, bodyDesc.referenceCount);
132 } 132 }
133 else 133 else
134 { 134 {
135 // New entry 135 // New entry
136 bodyDesc.ptr = shape.ptr; 136 bodyDesc.ptr = body.ptr;
137 bodyDesc.referenceCount = 1; 137 bodyDesc.referenceCount = 1;
138 DetailLog("{0},BSShapeCollection.ReferenceBody,newBody,ref={1}", shape.ID, bodyDesc.referenceCount); 138 DetailLog("{0},BSShapeCollection.ReferenceBody,newBody,ref={1}", body.ID, body, bodyDesc.referenceCount);
139 } 139 }
140 bodyDesc.lastReferenced = System.DateTime.Now; 140 bodyDesc.lastReferenced = System.DateTime.Now;
141 Bodies[shape.ID] = bodyDesc; 141 Bodies[body.ID] = bodyDesc;
142 } 142 }
143} 143}
144 144
@@ -256,7 +256,7 @@ public class BSShapeCollection : IDisposable
256 256
257 // Release the usage of a shape. 257 // Release the usage of a shape.
258 // The collisionObject is released since it is a copy of the real collision shape. 258 // The collisionObject is released since it is a copy of the real collision shape.
259 private void DereferenceShape(BulletShape shape, bool atTaintTime, ShapeDestructionCallback shapeCallback) 259 public void DereferenceShape(BulletShape shape, bool atTaintTime, ShapeDestructionCallback shapeCallback)
260 { 260 {
261 if (shape.ptr == IntPtr.Zero) 261 if (shape.ptr == IntPtr.Zero)
262 return; 262 return;