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

* Fixes one of two terse update issues. There's still one left, but this one fixes the situation where the object on the server is moving but no updates are being sent.

0.6.8-post-fixes
Teravus Ovares (Dan Olivares) 2009-11-21 04:33:34 -05:00
parent 8f0db68424
commit 0ffda7128e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@ -2083,6 +2083,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
if (PhysActor != null) if (PhysActor != null)
{ {
Vector3 newpos = new Vector3(PhysActor.Position.GetBytes(), 0); Vector3 newpos = new Vector3(PhysActor.Position.GetBytes(), 0);
if (m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.N) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.S) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.E) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.W)) if (m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.N) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.S) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.E) | m_parentGroup.Scene.TestBorderCross(newpos, Cardinals.W))
@ -2090,6 +2091,7 @@ namespace OpenSim.Region.Framework.Scenes
m_parentGroup.AbsolutePosition = newpos; m_parentGroup.AbsolutePosition = newpos;
return; return;
} }
//m_parentGroup.RootPart.m_groupPosition = newpos;
} }
ScheduleTerseUpdate(); ScheduleTerseUpdate();
@ -2428,6 +2430,7 @@ namespace OpenSim.Region.Framework.Scenes
ClearUpdateSchedule(); ClearUpdateSchedule();
} }
} }
ClearUpdateSchedule();
} }
/// <summary> /// <summary>

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

@ -2643,7 +2643,7 @@ Console.WriteLine(" JointCreateFixed");
//outofBounds = true; //outofBounds = true;
} }
// float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation)); //float Adiff = 1.0f - Math.Abs(Quaternion.Dot(m_lastorientation, l_orientation));
//Console.WriteLine("Adiff " + m_primName + " = " + Adiff); //Console.WriteLine("Adiff " + m_primName + " = " + Adiff);
if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02) if ((Math.Abs(m_lastposition.X - l_position.X) < 0.02)
&& (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02) && (Math.Abs(m_lastposition.Y - l_position.Y) < 0.02)
@ -2659,6 +2659,8 @@ Console.WriteLine(" JointCreateFixed");
{ {
//m_log.Debug(Math.Abs(m_lastposition.X - l_position.X).ToString()); //m_log.Debug(Math.Abs(m_lastposition.X - l_position.X).ToString());
_zeroFlag = false; _zeroFlag = false;
m_lastUpdateSent = false;
//m_throttleUpdates = false;
} }
if (_zeroFlag) if (_zeroFlag)
@ -2685,7 +2687,9 @@ Console.WriteLine(" JointCreateFixed");
m_rotationalVelocity = pv; m_rotationalVelocity = pv;
if (_parent == null) if (_parent == null)
{
base.RequestPhysicsterseUpdate(); base.RequestPhysicsterseUpdate();
}
m_lastUpdateSent = true; m_lastUpdateSent = true;
} }
@ -2695,8 +2699,10 @@ Console.WriteLine(" JointCreateFixed");
if (lastZeroFlag != _zeroFlag) if (lastZeroFlag != _zeroFlag)
{ {
if (_parent == null) if (_parent == null)
{
base.RequestPhysicsterseUpdate(); base.RequestPhysicsterseUpdate();
} }
}
m_lastVelocity = _velocity; m_lastVelocity = _velocity;
@ -2728,8 +2734,10 @@ Console.WriteLine(" JointCreateFixed");
if (!m_throttleUpdates || throttleCounter > _parent_scene.geomUpdatesPerThrottledUpdate) if (!m_throttleUpdates || throttleCounter > _parent_scene.geomUpdatesPerThrottledUpdate)
{ {
if (_parent == null) if (_parent == null)
{
base.RequestPhysicsterseUpdate(); base.RequestPhysicsterseUpdate();
} }
}
else else
{ {
throttleCounter++; throttleCounter++;