diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index c2acf97..0587054 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -261,7 +261,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 261 | 261 | ||
| 262 | public abstract Vector3 Torque { get; set; } | 262 | public abstract Vector3 Torque { get; set; } |
| 263 | public abstract float CollisionScore { get; set;} | 263 | public abstract float CollisionScore { get; set;} |
| 264 | public abstract Vector3 Acceleration { get; } | 264 | public abstract Vector3 Acceleration { get; set; } |
| 265 | public abstract Quaternion Orientation { get; set; } | 265 | public abstract Quaternion Orientation { get; set; } |
| 266 | public abstract int PhysicsActorType { get; set; } | 266 | public abstract int PhysicsActorType { get; set; } |
| 267 | public abstract bool IsPhysical { get; set; } | 267 | public abstract bool IsPhysical { get; set; } |
| @@ -458,6 +458,7 @@ namespace OpenSim.Region.Physics.Manager | |||
| 458 | public override Vector3 Acceleration | 458 | public override Vector3 Acceleration |
| 459 | { | 459 | { |
| 460 | get { return Vector3.Zero; } | 460 | get { return Vector3.Zero; } |
| 461 | set { } | ||
| 461 | } | 462 | } |
| 462 | 463 | ||
| 463 | public override bool IsPhysical | 464 | public override bool IsPhysical |