diff options
Diffstat (limited to 'OpenSim/Region/Physics')
| -rw-r--r-- | OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs index c516044..f26b9a1 100644 --- a/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs +++ b/OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPlugin.cs | |||
| @@ -246,4 +246,4 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin | |||
| 246 | { | 246 | { |
| 247 | } | 247 | } |
| 248 | } | 248 | } |
| 249 | } | 249 | } \ No newline at end of file |
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 74608ef..f1d0f84 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -59,7 +59,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 59 | public abstract Quaternion Orientation { get; set; } | 59 | public abstract Quaternion Orientation { get; set; } |
| 60 | 60 | ||
| 61 | public abstract bool Flying { get; set; } | 61 | public abstract bool Flying { get; set; } |
| 62 | 62 | ||
| 63 | public abstract bool IsColliding { get; set; } | 63 | public abstract bool IsColliding { get; set; } |
| 64 | 64 | ||
| 65 | public abstract bool Kinematic { get; set; } | 65 | public abstract bool Kinematic { get; set; } |
| @@ -105,6 +105,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 105 | get { return false; } | 105 | get { return false; } |
| 106 | set { return; } | 106 | set { return; } |
| 107 | } | 107 | } |
| 108 | |||
| 108 | public override bool IsColliding | 109 | public override bool IsColliding |
| 109 | { | 110 | { |
| 110 | get { return false; } | 111 | get { return false; } |
| @@ -127,4 +128,4 @@ namespace OpenSim.Region.Physics.Manager | |||
| 127 | return; | 128 | return; |
| 128 | } | 129 | } |
| 129 | } | 130 | } |
| 130 | } | 131 | } \ No newline at end of file |