From 4c10826caa4b2b19200ab3f0272bb1c20c26c53e Mon Sep 17 00:00:00 2001
From: KittoFlora
Date: Mon, 16 Nov 2009 02:12:56 +0100
Subject: Fix merge conflicts

---
 OpenSim/Region/Physics/Manager/PhysicsActor.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Physics/Manager/PhysicsActor.cs')

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
         public abstract float APIDStrength { set;}
         public abstract float APIDDamping { set;}
         
-        public abstract void AddForce(PhysicsVector force, bool pushforce);
-        public abstract void AddAngularForce(PhysicsVector force, bool pushforce);
-        public abstract void SetMomentum(PhysicsVector momentum);
+        public abstract void AddForce(Vector3 force, bool pushforce);
+        public abstract void AddAngularForce(Vector3 force, bool pushforce);
+        public abstract void SetMomentum(Vector3 momentum);
         public abstract void SubscribeEvents(int ms);
         public abstract void UnSubscribeEvents();
         public abstract bool SubscribedEvents();
-- 
cgit v1.1