diff options
Diffstat (limited to '')
-rwxr-xr-x | OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs index ead6a08..538f905 100755 --- a/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs +++ b/OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs | |||
@@ -46,7 +46,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
46 | PhysObjectName = name; | 46 | PhysObjectName = name; |
47 | TypeName = typeName; | 47 | TypeName = typeName; |
48 | 48 | ||
49 | Linkset = new BSLinkset(PhysicsScene, this); | 49 | Linkset = BSLinkset.Factory(PhysicsScene, this); |
50 | LastAssetBuildFailed = false; | 50 | LastAssetBuildFailed = false; |
51 | 51 | ||
52 | CollisionCollection = new CollisionEventUpdate(); | 52 | CollisionCollection = new CollisionEventUpdate(); |
@@ -78,7 +78,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
78 | public PrimitiveBaseShape BaseShape { get; protected set; } | 78 | public PrimitiveBaseShape BaseShape { get; protected set; } |
79 | 79 | ||
80 | // When the physical properties are updated, an EntityProperty holds the update values. | 80 | // When the physical properties are updated, an EntityProperty holds the update values. |
81 | // Keep the current and last EntityProperties to enable computation of differences | 81 | // Keep the current and last EntityProperties to enable computation of differences |
82 | // between the current update and the previous values. | 82 | // between the current update and the previous values. |
83 | public EntityProperties CurrentEntityProperties { get; set; } | 83 | public EntityProperties CurrentEntityProperties { get; set; } |
84 | public EntityProperties LastEntityProperties { get; set; } | 84 | public EntityProperties LastEntityProperties { get; set; } |
@@ -213,7 +213,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
213 | UnSubscribeEvents(); | 213 | UnSubscribeEvents(); |
214 | } | 214 | } |
215 | } | 215 | } |
216 | public override void UnSubscribeEvents() { | 216 | public override void UnSubscribeEvents() { |
217 | // DetailLog("{0},{1}.UnSubscribeEvents,unsubscribing", LocalID, TypeName); | 217 | // DetailLog("{0},{1}.UnSubscribeEvents,unsubscribing", LocalID, TypeName); |
218 | SubscribedEventsMs = 0; | 218 | SubscribedEventsMs = 0; |
219 | PhysicsScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate() | 219 | PhysicsScene.TaintedObject(TypeName+".UnSubscribeEvents", delegate() |
@@ -222,7 +222,7 @@ public abstract class BSPhysObject : PhysicsActor | |||
222 | }); | 222 | }); |
223 | } | 223 | } |
224 | // Return 'true' if the simulator wants collision events | 224 | // Return 'true' if the simulator wants collision events |
225 | public override bool SubscribedEvents() { | 225 | public override bool SubscribedEvents() { |
226 | return (SubscribedEventsMs > 0); | 226 | return (SubscribedEventsMs > 0); |
227 | } | 227 | } |
228 | 228 | ||