aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
diff options
context:
space:
mode:
authorMelanie2011-11-05 00:11:10 +0000
committerMelanie2011-11-05 00:11:10 +0000
commitb199aad037d9b111bca36d00867569e4d6e76aee (patch)
tree5c3b9860647d474077eaca9e43a919554ef9fbf3 /OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
parentReplacing te linking code with the code from Avination. Link sets prims are now (diff)
parentAdd comment for experimental effect of removing the Thread.Sleep(20) in ODEPr... (diff)
downloadopensim-SC_OLD-b199aad037d9b111bca36d00867569e4d6e76aee.zip
opensim-SC_OLD-b199aad037d9b111bca36d00867569e4d6e76aee.tar.gz
opensim-SC_OLD-b199aad037d9b111bca36d00867569e4d6e76aee.tar.bz2
opensim-SC_OLD-b199aad037d9b111bca36d00867569e4d6e76aee.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Physics/OdePlugin/ODECharacter.cs')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
index 19d87c2..3630510 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
@@ -1269,7 +1269,7 @@ namespace OpenSim.Region.Physics.OdePlugin
1269 // m_taintForce = Vector3.Zero. Need to lock ProcessTaints() when we set a new tainted force. 1269 // m_taintForce = Vector3.Zero. Need to lock ProcessTaints() when we set a new tainted force.
1270 doForce(m_taintForce); 1270 doForce(m_taintForce);
1271 } 1271 }
1272 1272
1273 m_taintForce = Vector3.Zero; 1273 m_taintForce = Vector3.Zero;
1274 } 1274 }
1275 1275