diff options
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs index 939d5e9..65ebcaa 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||
@@ -98,7 +98,7 @@ public sealed class BSShapeCollection : IDisposable | |||
98 | // higher level dependencies on the shape or body. Mostly used for LinkSets to | 98 | // higher level dependencies on the shape or body. Mostly used for LinkSets to |
99 | // remove the physical constraints before the body is destroyed. | 99 | // remove the physical constraints before the body is destroyed. |
100 | // Called at taint-time!! | 100 | // Called at taint-time!! |
101 | public bool GetBodyAndShape(bool forceRebuild, BulletSim sim, BSPhysObject prim, | 101 | public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim, |
102 | ShapeDestructionCallback shapeCallback, BodyDestructionCallback bodyCallback) | 102 | ShapeDestructionCallback shapeCallback, BodyDestructionCallback bodyCallback) |
103 | { | 103 | { |
104 | PhysicsScene.AssertInTaintTime("BSShapeCollection.GetBodyAndShape"); | 104 | PhysicsScene.AssertInTaintTime("BSShapeCollection.GetBodyAndShape"); |
@@ -126,7 +126,7 @@ public sealed class BSShapeCollection : IDisposable | |||
126 | return ret; | 126 | return ret; |
127 | } | 127 | } |
128 | 128 | ||
129 | public bool GetBodyAndShape(bool forceRebuild, BulletSim sim, BSPhysObject prim) | 129 | public bool GetBodyAndShape(bool forceRebuild, BulletWorld sim, BSPhysObject prim) |
130 | { | 130 | { |
131 | return GetBodyAndShape(forceRebuild, sim, prim, null, null); | 131 | return GetBodyAndShape(forceRebuild, sim, prim, null, null); |
132 | } | 132 | } |
@@ -918,7 +918,7 @@ public sealed class BSShapeCollection : IDisposable | |||
918 | // Updates prim.BSBody with the information about the new body if one is created. | 918 | // Updates prim.BSBody with the information about the new body if one is created. |
919 | // Returns 'true' if an object was actually created. | 919 | // Returns 'true' if an object was actually created. |
920 | // Called at taint-time. | 920 | // Called at taint-time. |
921 | private bool CreateBody(bool forceRebuild, BSPhysObject prim, BulletSim sim, BulletShape shape, | 921 | private bool CreateBody(bool forceRebuild, BSPhysObject prim, BulletWorld sim, BulletShape shape, |
922 | BodyDestructionCallback bodyCallback) | 922 | BodyDestructionCallback bodyCallback) |
923 | { | 923 | { |
924 | bool ret = false; | 924 | bool ret = false; |