aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorKittoFlora2009-11-16 02:12:56 +0100
committerKittoFlora2009-11-16 02:12:56 +0100
commit4c10826caa4b2b19200ab3f0272bb1c20c26c53e (patch)
tree334727cadfbb699d9a67cf16f55daded4c1f37bd /OpenSim
parentMerge branch 'careminster' into tests (diff)
downloadopensim-SC_OLD-4c10826caa4b2b19200ab3f0272bb1c20c26c53e.zip
opensim-SC_OLD-4c10826caa4b2b19200ab3f0272bb1c20c26c53e.tar.gz
opensim-SC_OLD-4c10826caa4b2b19200ab3f0272bb1c20c26c53e.tar.bz2
opensim-SC_OLD-4c10826caa4b2b19200ab3f0272bb1c20c26c53e.tar.xz
Fix merge conflicts
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/Manager/PhysicsActor.cs6
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs7
2 files changed, 3 insertions, 10 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();
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index b963d65..8f2c801 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -107,17 +107,10 @@ namespace OpenSim.Region.Physics.OdePlugin
107 private float m_PIDHoverTau; 107 private float m_PIDHoverTau;
108 private bool m_useHoverPID; 108 private bool m_useHoverPID;
109 private PIDHoverType m_PIDHoverType = PIDHoverType.Ground; 109 private PIDHoverType m_PIDHoverType = PIDHoverType.Ground;
110<<<<<<< HEAD:OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
111 private float m_targetHoverHeight = 0f;
112 private float m_groundHeight = 0f;
113 private float m_waterHeight = 0f;
114 private float m_buoyancy = 0f; //Set by llSetBuoyancy(), for non-vehicles.
115=======
116 private float m_targetHoverHeight; 110 private float m_targetHoverHeight;
117 private float m_groundHeight; 111 private float m_groundHeight;
118 private float m_waterHeight; 112 private float m_waterHeight;
119 private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. 113 private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
120>>>>>>> vehicles:OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
121 114
122 // private float m_tensor = 5f; 115 // private float m_tensor = 5f;
123 private int body_autodisable_frames = 20; 116 private int body_autodisable_frames = 20;