aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorMelanie2009-12-22 00:41:56 +0000
committerMelanie2009-12-22 00:41:56 +0000
commitfa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f (patch)
treef644f2171b694ac6997c887ba442be9770fdce73 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
parentMerge branch 'master' into careminster (diff)
parentGlue code for a couple of new LSL function implementations (diff)
downloadopensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.zip
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.gz
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.bz2
opensim-SC-fa0621b486c63a0cc6ca6aaac00f3b0a50fdbd3f.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index b99baa2..75b5b5a 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1217,8 +1217,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1217 set { return; } 1217 set { return; }
1218 } 1218 }
1219 1219
1220
1221
1222 public override void SubscribeEvents(int ms) 1220 public override void SubscribeEvents(int ms)
1223 { 1221 {
1224 m_requestedUpdateFrequency = ms; 1222 m_requestedUpdateFrequency = ms;