Revert "Push updates from keyframe directly to the front of the output queue rather"

This reverts commit 04235e58e8.
This commit is contained in:
Melanie
2013-02-12 03:15:40 +01:00
parent 2065590232
commit 14c064c65d
5 changed files with 10 additions and 46 deletions

View File

@@ -3721,12 +3721,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// </summary>
public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
{
if ((updateFlags & PrimUpdateFlags.Immediate) != 0)
{
SendUnqueuedTerseUpdate((SceneObjectPart)entity);
return;
}
if (entity is SceneObjectPart)
{
SceneObjectPart e = (SceneObjectPart)entity;
@@ -4081,20 +4075,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
ProcessEntityUpdates(-1);
}
public void SendUnqueuedTerseUpdate(SceneObjectPart part)
{
ImprovedTerseObjectUpdatePacket packet
= (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
PacketType.ImprovedTerseObjectUpdate);
packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
packet.RegionData.TimeDilation = Utils.FloatToUInt16(1.0f, 0.0f, 1.0f);
packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
packet.ObjectData[0] = CreateImprovedTerseBlock(part, false);
OutPacket(packet, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
}
#endregion Primitive Packet/Data Sending Methods
// These are used to implement an adaptive backoff in the number