OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge conflicts

avinationmerge
KittoFlora 2009-11-16 02:12:56 +01:00
parent 873c9098d8
commit 4c10826caa
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/Physics/Manager/PhysicsActor.cs
View File

@ -249,9 +249,9 @@ namespace OpenSim.Region.Physics.Manager
public abstract float APIDStrength { set;} public abstract float APIDStrength { set;}
public abstract float APIDDamping { set;} public abstract float APIDDamping { set;}
public abstract void AddForce(PhysicsVector force, bool pushforce); public abstract void AddForce(Vector3 force, bool pushforce);
public abstract void AddAngularForce(PhysicsVector force, bool pushforce); public abstract void AddAngularForce(Vector3 force, bool pushforce);
public abstract void SetMomentum(PhysicsVector momentum); public abstract void SetMomentum(Vector3 momentum);
public abstract void SubscribeEvents(int ms); public abstract void SubscribeEvents(int ms);
public abstract void UnSubscribeEvents(); public abstract void UnSubscribeEvents();
public abstract bool SubscribedEvents(); public abstract bool SubscribedEvents();

7
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -107,17 +107,10 @@ namespace OpenSim.Region.Physics.OdePlugin
private float m_PIDHoverTau; private float m_PIDHoverTau;
private bool m_useHoverPID; private bool m_useHoverPID;
private PIDHoverType m_PIDHoverType = PIDHoverType.Ground; private PIDHoverType m_PIDHoverType = PIDHoverType.Ground;
<<<<<<< HEAD:OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
private float m_targetHoverHeight = 0f;
private float m_groundHeight = 0f;
private float m_waterHeight = 0f;
private float m_buoyancy = 0f; //Set by llSetBuoyancy(), for non-vehicles.
=======
private float m_targetHoverHeight; private float m_targetHoverHeight;
private float m_groundHeight; private float m_groundHeight;
private float m_waterHeight; private float m_waterHeight;
private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle. private float m_buoyancy; //KF: m_buoyancy should be set by llSetBuoyancy() for non-vehicle.
>>>>>>> vehicles:OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
// private float m_tensor = 5f; // private float m_tensor = 5f;
private int body_autodisable_frames = 20; private int body_autodisable_frames = 20;