ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move position set from taint to logically better position at top of ODECharacter.ProcessTaints() though this makes no practical difference

Browse Source
This commit is contained in:
Justin Clark-Casey (justincc)
2011-10-29 01:46:22 +01:00
parent 5ae8de3c00
commit a5ea9f8830
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1250,6 +1250,18 @@ namespace OpenSim.Region.Physics.OdePlugin
internal void ProcessTaints()
{
if (m_taintPosition != _position)
{
if (Body != IntPtr.Zero)
{
d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z);
_position.X = m_taintPosition.X;
_position.Y = m_taintPosition.Y;
_position.Z = m_taintPosition.Z;
}
}
if (m_tainted_isPhysical != m_isPhysical)
{
if (m_tainted_isPhysical)
@@ -1309,18 +1321,6 @@ namespace OpenSim.Region.Physics.OdePlugin
+ (Amotor==IntPtr.Zero ? "Amotor ":""));
}
}
if (!m_taintPosition.ApproxEquals(_position, 0.05f))
{
if (Body != IntPtr.Zero)
{
d.BodySetPosition(Body, m_taintPosition.X, m_taintPosition.Y, m_taintPosition.Z);
_position.X = m_taintPosition.X;
_position.Y = m_taintPosition.Y;
_position.Z = m_taintPosition.Z;
}
}
}
internal void AddCollisionFrameTime(int p)