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

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

iar_mods
Justin Clark-Casey (justincc) 2011-12-14 17:59:55 +00:00
parent 84023c8162 f43e5f92fd
commit cec88872ae
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -1373,6 +1373,8 @@ namespace OpenSim.Region.Framework.Scenes
#endregion #endregion
// Send the parts of this SOG to a single client
// Used when the client initially connects and when client sends RequestPrim packet
public void SendFullUpdateToClient(IClientAPI remoteClient) public void SendFullUpdateToClient(IClientAPI remoteClient)
{ {
RootPart.SendFullUpdate( RootPart.SendFullUpdate(

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

@ -259,8 +259,6 @@ namespace OpenSim.Region.Framework.Scenes
private bool m_passTouches; private bool m_passTouches;
private UpdateRequired m_updateFlag;
private PhysicsActor m_physActor; private PhysicsActor m_physActor;
protected Vector3 m_acceleration; protected Vector3 m_acceleration;
protected Vector3 m_angularVelocity; protected Vector3 m_angularVelocity;
@ -1004,11 +1002,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
public UpdateRequired UpdateFlag public UpdateRequired UpdateFlag { get; set; }
{
get { return m_updateFlag; }
set { m_updateFlag = value; }
}
/// <summary> /// <summary>
/// Used for media on a prim. /// Used for media on a prim.
@ -2949,6 +2943,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
case UpdateRequired.TERSE: case UpdateRequired.TERSE:
{ {
ClearUpdateSchedule();
// Throw away duplicate or insignificant updates // Throw away duplicate or insignificant updates
if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) || if (!RotationOffset.ApproxEquals(m_lastRotation, ROTATION_TOLERANCE) ||
!Acceleration.Equals(m_lastAcceleration) || !Acceleration.Equals(m_lastAcceleration) ||
@ -2958,9 +2953,7 @@ namespace OpenSim.Region.Framework.Scenes
!OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) || !OffsetPosition.ApproxEquals(m_lastPosition, POSITION_TOLERANCE) ||
Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE) Environment.TickCount - m_lastTerseSent > TIME_MS_TOLERANCE)
{ {
SendTerseUpdateToAllClients(); SendTerseUpdateToAllClients();
ClearUpdateSchedule();
// Update the "last" values // Update the "last" values
m_lastPosition = OffsetPosition; m_lastPosition = OffsetPosition;
@ -2974,12 +2967,11 @@ namespace OpenSim.Region.Framework.Scenes
} }
case UpdateRequired.FULL: case UpdateRequired.FULL:
{ {
ClearUpdateSchedule();
SendFullUpdateToAllClients(); SendFullUpdateToAllClients();
break; break;
} }
} }
ClearUpdateSchedule();
} }
/// <summary> /// <summary>