aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-11-05 00:11:10 +0000
committerMelanie2011-11-05 00:11:10 +0000
commitb199aad037d9b111bca36d00867569e4d6e76aee (patch)
tree5c3b9860647d474077eaca9e43a919554ef9fbf3
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-b199aad037d9b111bca36d00867569e4d6e76aee.zip
opensim-SC-b199aad037d9b111bca36d00867569e4d6e76aee.tar.gz
opensim-SC-b199aad037d9b111bca36d00867569e4d6e76aee.tar.bz2
opensim-SC-b199aad037d9b111bca36d00867569e4d6e76aee.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODECharacter.cs2
-rw-r--r--OpenSim/Region/Physics/OdePlugin/ODEPrim.cs3
2 files changed, 4 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
diff --git a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
index ea6af3a..2f9a54b 100644
--- a/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
+++ b/OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
@@ -2250,7 +2250,10 @@ Console.WriteLine(" JointCreateFixed");
2250 { 2250 {
2251 if (!m_isSelected) 2251 if (!m_isSelected)
2252 { 2252 {
2253 // Not sure exactly why this sleep is here, but from experimentation it appears to stop an avatar
2254 // walking through a default rez size prim if it keeps kicking it around - justincc.
2253 Thread.Sleep(20); 2255 Thread.Sleep(20);
2256
2254 if (IsPhysical) 2257 if (IsPhysical)
2255 { 2258 {
2256 if (Body != IntPtr.Zero) 2259 if (Body != IntPtr.Zero)