ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 01:35:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2009-12-22 00:41:56 +00:00
parent 84a1a0a729 e530180c1e
commit fa0621b486
9 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@@ -1217,8 +1217,6 @@ namespace OpenSim.Region.Physics.OdePlugin
set { return; }
}
public override void SubscribeEvents(int ms)
{
m_requestedUpdateFrequency = ms;

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

@@ -2886,16 +2886,19 @@ Console.WriteLine(" JointCreateFixed");
public override bool PIDActive { set { m_usePID = value; } }
public override float PIDTau { set { m_PIDTau = value; } }
// For RotLookAt
public override Quaternion APIDTarget { set { m_APIDTarget = value; } }
public override bool APIDActive { set { m_useAPID = value; } }
public override float APIDStrength { set { m_APIDStrength = value; } }
public override float APIDDamping { set { m_APIDDamping = value; } }
public override float PIDHoverHeight { set { m_PIDHoverHeight = value; ; } }
public override bool PIDHoverActive { set { m_useHoverPID = value; } }
public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
public override Quaternion APIDTarget{ set { return; } }
public override bool APIDActive{ set { return; } }
public override float APIDStrength{ set { return; } }
public override float APIDDamping{ set { return; } }
private void createAMotor(Vector3 axis)
{