diff options
Diffstat (limited to 'OpenSim/Region/Physics/Manager')
-rw-r--r-- | OpenSim/Region/Physics/Manager/CollisionLocker.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/CollisionLocker.cs b/OpenSim/Region/Physics/Manager/CollisionLocker.cs index 8c2e702..98e9736 100644 --- a/OpenSim/Region/Physics/Manager/CollisionLocker.cs +++ b/OpenSim/Region/Physics/Manager/CollisionLocker.cs | |||
@@ -35,7 +35,7 @@ namespace OpenSim.Region.Physics.Manager | |||
35 | public class CollisionLocker | 35 | public class CollisionLocker |
36 | { | 36 | { |
37 | 37 | ||
38 | private bool locked = false; | 38 | |
39 | private List<IntPtr> worldlock = new List<IntPtr>(); | 39 | private List<IntPtr> worldlock = new List<IntPtr>(); |
40 | public CollisionLocker() | 40 | public CollisionLocker() |
41 | { | 41 | { |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 97eccba..b96ce27 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
@@ -118,6 +118,8 @@ namespace OpenSim.Region.Physics.Manager | |||
118 | get { return new NullPhysicsActor(); } | 118 | get { return new NullPhysicsActor(); } |
119 | } | 119 | } |
120 | 120 | ||
121 | public abstract bool Stopped { get; } | ||
122 | |||
121 | public abstract PhysicsVector Size { get; set; } | 123 | public abstract PhysicsVector Size { get; set; } |
122 | 124 | ||
123 | public abstract PrimitiveBaseShape Shape { set; } | 125 | public abstract PrimitiveBaseShape Shape { set; } |
@@ -204,6 +206,11 @@ namespace OpenSim.Region.Physics.Manager | |||
204 | 206 | ||
205 | public class NullPhysicsActor : PhysicsActor | 207 | public class NullPhysicsActor : PhysicsActor |
206 | { | 208 | { |
209 | public override bool Stopped | ||
210 | { | ||
211 | get{ return false; } | ||
212 | } | ||
213 | |||
207 | public override PhysicsVector Position | 214 | public override PhysicsVector Position |
208 | { | 215 | { |
209 | get { return PhysicsVector.Zero; } | 216 | get { return PhysicsVector.Zero; } |