OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

remove-scene-viewer
Melanie 2011-11-05 00:11:10 +00:00
parent c803ed28c3 f7b8c54c24
commit b199aad037
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/OdePlugin/ODECharacter.cs
View File

@ -1269,7 +1269,7 @@ namespace OpenSim.Region.Physics.OdePlugin
// m_taintForce = Vector3.Zero. Need to lock ProcessTaints() when we set a new tainted force. // m_taintForce = Vector3.Zero. Need to lock ProcessTaints() when we set a new tainted force.
doForce(m_taintForce); doForce(m_taintForce);
} }
m_taintForce = Vector3.Zero; m_taintForce = Vector3.Zero;
} }

3
OpenSim/Region/Physics/OdePlugin/ODEPrim.cs
View File

@ -2250,7 +2250,10 @@ Console.WriteLine(" JointCreateFixed");
{ {
if (!m_isSelected) if (!m_isSelected)
{ {
// Not sure exactly why this sleep is here, but from experimentation it appears to stop an avatar
// walking through a default rez size prim if it keeps kicking it around - justincc.
Thread.Sleep(20); Thread.Sleep(20);
if (IsPhysical) if (IsPhysical)
{ {
if (Body != IntPtr.Zero) if (Body != IntPtr.Zero)