diff options
author | Melanie | 2009-12-22 00:41:56 +0000 |
---|---|---|
committer | Melanie | 2009-12-22 00:41:56 +0000 |
commit | fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f (patch) | |
tree | f644f2171b694ac6997c887ba442be9770fdce73 /OpenSim/Region/Physics/Manager/PhysicsActor.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Glue code for a couple of new LSL function implementations (diff) | |
download | opensim-SC_OLD-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.zip opensim-SC_OLD-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.gz opensim-SC_OLD-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.bz2 opensim-SC_OLD-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
-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 | } |