aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorMelanie2013-02-12 03:15:40 +0100
committerMelanie2013-02-12 03:15:40 +0100
commit14c064c65da3d9cce045664f83daaeb7a79edcdd (patch)
tree9b21d8a9022750c84e8f90a7440d4ba2830d3ead /OpenSim/Region/ClientStack
parentRevert "Use actual time dilation for unqueued updates" (diff)
downloadopensim-SC_OLD-14c064c65da3d9cce045664f83daaeb7a79edcdd.zip
opensim-SC_OLD-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.gz
opensim-SC_OLD-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.bz2
opensim-SC_OLD-14c064c65da3d9cce045664f83daaeb7a79edcdd.tar.xz
Revert "Push updates from keyframe directly to the front of the output queue rather"
This reverts commit 04235e58e87ae42617111cad2884e42785914d4e.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs20
1 files changed, 0 insertions, 20 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 8d46415..ca15e3e 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -3721,12 +3721,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3721 /// </summary> 3721 /// </summary>
3722 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags) 3722 public void SendEntityUpdate(ISceneEntity entity, PrimUpdateFlags updateFlags)
3723 { 3723 {
3724 if ((updateFlags & PrimUpdateFlags.Immediate) != 0)
3725 {
3726 SendUnqueuedTerseUpdate((SceneObjectPart)entity);
3727 return;
3728 }
3729
3730 if (entity is SceneObjectPart) 3724 if (entity is SceneObjectPart)
3731 { 3725 {
3732 SceneObjectPart e = (SceneObjectPart)entity; 3726 SceneObjectPart e = (SceneObjectPart)entity;
@@ -4081,20 +4075,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
4081 ProcessEntityUpdates(-1); 4075 ProcessEntityUpdates(-1);
4082 } 4076 }
4083 4077
4084 public void SendUnqueuedTerseUpdate(SceneObjectPart part)
4085 {
4086 ImprovedTerseObjectUpdatePacket packet
4087 = (ImprovedTerseObjectUpdatePacket)PacketPool.Instance.GetPacket(
4088 PacketType.ImprovedTerseObjectUpdate);
4089 packet.RegionData.RegionHandle = m_scene.RegionInfo.RegionHandle;
4090 packet.RegionData.TimeDilation = Utils.FloatToUInt16(1.0f, 0.0f, 1.0f);
4091 packet.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
4092
4093 packet.ObjectData[0] = CreateImprovedTerseBlock(part, false);
4094
4095 OutPacket(packet, ThrottleOutPacketType.Task | ThrottleOutPacketType.HighPriority);
4096 }
4097
4098 #endregion Primitive Packet/Data Sending Methods 4078 #endregion Primitive Packet/Data Sending Methods
4099 4079
4100 // These are used to implement an adaptive backoff in the number 4080 // These are used to implement an adaptive backoff in the number