diff options
| author | KittoFlora | 2009-11-16 02:12:56 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-16 02:12:56 +0100 |
| commit | 4c10826caa4b2b19200ab3f0272bb1c20c26c53e (patch) | |
| tree | 334727cadfbb699d9a67cf16f55daded4c1f37bd /OpenSim/Region/Physics/Manager/PhysicsActor.cs | |
| parent | Merge branch 'careminster' into tests (diff) | |
| download | opensim-SC-4c10826caa4b2b19200ab3f0272bb1c20c26c53e.zip opensim-SC-4c10826caa4b2b19200ab3f0272bb1c20c26c53e.tar.gz opensim-SC-4c10826caa4b2b19200ab3f0272bb1c20c26c53e.tar.bz2 opensim-SC-4c10826caa4b2b19200ab3f0272bb1c20c26c53e.tar.xz | |
Fix merge conflicts
Diffstat (limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')
| -rw-r--r-- | OpenSim/Region/Physics/Manager/PhysicsActor.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Manager/PhysicsActor.cs b/OpenSim/Region/Physics/Manager/PhysicsActor.cs index 8241e8f..b82586f 100644 --- a/OpenSim/Region/Physics/Manager/PhysicsActor.cs +++ b/OpenSim/Region/Physics/Manager/PhysicsActor.cs | |||
| @@ -249,9 +249,9 @@ namespace OpenSim.Region.Physics.Manager | |||
| 249 | public abstract float APIDStrength { set;} | 249 | public abstract float APIDStrength { set;} |
| 250 | public abstract float APIDDamping { set;} | 250 | public abstract float APIDDamping { set;} |
| 251 | 251 | ||
| 252 | public abstract void AddForce(PhysicsVector force, bool pushforce); | 252 | public abstract void AddForce(Vector3 force, bool pushforce); |
| 253 | public abstract void AddAngularForce(PhysicsVector force, bool pushforce); | 253 | public abstract void AddAngularForce(Vector3 force, bool pushforce); |
| 254 | public abstract void SetMomentum(PhysicsVector momentum); | 254 | public abstract void SetMomentum(Vector3 momentum); |
| 255 | public abstract void SubscribeEvents(int ms); | 255 | public abstract void SubscribeEvents(int ms); |
| 256 | public abstract void UnSubscribeEvents(); | 256 | public abstract void UnSubscribeEvents(); |
| 257 | public abstract bool SubscribedEvents(); | 257 | public abstract bool SubscribedEvents(); |