aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin
diff options
context:
space:
mode:
authorMelanie2009-12-22 00:26:12 +0000
committerMelanie2009-12-22 00:26:12 +0000
commite530180c1e8e9758df7cb9a72ad0715fd7c8a0e7 (patch)
tree4dd38866eae8bd8e989273ed2cccf3c9dd11deb4 /OpenSim/Region/Physics/OdePlugin
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7.zip
opensim-SC_OLD-e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7.tar.gz
opensim-SC_OLD-e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7.tar.bz2
opensim-SC_OLD-e530180c1e8e9758df7cb9a72ad0715fd7c8a0e7.tar.xz
Glue code for a couple of new LSL function implementations
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs9
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs9
2 files changed, 18 insertions, 0 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 40fbde1..06ed8fb 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1196,6 +1196,15 @@ namespace OpenSim.Region.Physics.OdePlugin
1196 public override bool PIDHoverActive { set { return; } } 1196 public override bool PIDHoverActive { set { return; } }
1197 public override PIDHoverType PIDHoverType { set { return; } } 1197 public override PIDHoverType PIDHoverType { set { return; } }
1198 public override float PIDHoverTau { set { return; } } 1198 public override float PIDHoverTau { set { return; } }
1199
1200 public override Quaternion APIDTarget{ set { return; } }
1201
1202 public override bool APIDActive{ set { return; } }
1203
1204 public override float APIDStrength{ set { return; } }
1205
1206 public override float APIDDamping{ set { return; } }
1207
1199 1208
1200 public override void SubscribeEvents(int ms) 1209 public override void SubscribeEvents(int ms)
1201 { 1210 {
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index d241574..3eb3b28 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2827,6 +2827,15 @@ Console.WriteLine(" JointCreateFixed");
2827 public override bool PIDHoverActive { set { m_useHoverPID = value; } } 2827 public override bool PIDHoverActive { set { m_useHoverPID = value; } }
2828 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } } 2828 public override PIDHoverType PIDHoverType { set { m_PIDHoverType = value; } }
2829 public override float PIDHoverTau { set { m_PIDHoverTau = value; } } 2829 public override float PIDHoverTau { set { m_PIDHoverTau = value; } }
2830
2831 public override Quaternion APIDTarget{ set { return; } }
2832
2833 public override bool APIDActive{ set { return; } }
2834
2835 public override float APIDStrength{ set { return; } }
2836
2837 public override float APIDDamping{ set { return; } }
2838
2830 2839
2831 private void createAMotor(Vector3 axis) 2840 private void createAMotor(Vector3 axis)
2832 { 2841 {