aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-04 23:43:17 +0000
committerJustin Clark-Casey (justincc)2011-11-04 23:43:17 +0000
commitf7b8c54c24c9495bb54fb3443856e25d18e11230 (patch)
treebe35c9980b6b25286c941d46f2d9644cb2ba61b4
parentOn standup, trigger the changed link script event after the avatar has been f... (diff)
downloadopensim-SC_OLD-f7b8c54c24c9495bb54fb3443856e25d18e11230.zip
opensim-SC_OLD-f7b8c54c24c9495bb54fb3443856e25d18e11230.tar.gz
opensim-SC_OLD-f7b8c54c24c9495bb54fb3443856e25d18e11230.tar.bz2
opensim-SC_OLD-f7b8c54c24c9495bb54fb3443856e25d18e11230.tar.xz
Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPrim.changevelocity()
-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)