diff options
| author | Kitto Flora | 2009-12-22 00:33:31 -0500 |
|---|---|---|
| committer | Kitto Flora | 2009-12-22 00:33:31 -0500 |
| commit | 93b930b9370b1439c4416c08a45fe7f23a5862c7 (patch) | |
| tree | e3546d86b64e9e2c13c4fba40a364857bfb0a8e7 /OpenSim/Region/Physics/Manager | |
| parent | Include ChOdePlugin (diff) | |
| parent | Should not commit without compiling (diff) | |
| download | opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.zip opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.gz opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.bz2 opensim-SC-93b930b9370b1439c4416c08a45fe7f23a5862c7.tar.xz | |
Fix conflicts
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index b82586f..10b153d 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -487,7 +487,6 @@ namespace OpenSim.Region.Physics.Manager | |||
| 487 | public override float APIDStrength { set { return; } } | 487 | public override float APIDStrength { set { return; } } |
| 488 | public override float APIDDamping { set { return; } } | 488 | public override float APIDDamping { set { return; } } |
| 489 | 489 | ||
| 490 | |||
| 491 | public override void SetMomentum(Vector3 momentum) | 490 | public override void SetMomentum(Vector3 momentum) |
| 492 | { | 491 | { |
| 493 | } | 492 | } |