aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
diff options
context:
space:
mode:
authorJohn Hurliman2009-10-13 19:45:38 -0700
committerJohn Hurliman2009-10-13 19:45:38 -0700
commit4135b0c4dcd142fe43b4c1b020d41a72d9df63dd (patch)
tree0dc6a320589d0486989f0f061a2912db477d51cd /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
parentOptimized heartbeat by calling Update() only on updated objects. (diff)
downloadopensim-SC_OLD-4135b0c4dcd142fe43b4c1b020d41a72d9df63dd.zip
opensim-SC_OLD-4135b0c4dcd142fe43b4c1b020d41a72d9df63dd.tar.gz
opensim-SC_OLD-4135b0c4dcd142fe43b4c1b020d41a72d9df63dd.tar.bz2
opensim-SC_OLD-4135b0c4dcd142fe43b4c1b020d41a72d9df63dd.tar.xz
* Split Task category into Task and State
* Crude prioritization hack
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index ac558ff..3b1a0bd 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1223,7 +1223,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1223 kill.ObjectData[0].ID = localID; 1223 kill.ObjectData[0].ID = localID;
1224 kill.Header.Reliable = true; 1224 kill.Header.Reliable = true;
1225 kill.Header.Zerocoded = true; 1225 kill.Header.Zerocoded = true;
1226 OutPacket(kill, ThrottleOutPacketType.Task); 1226 OutPacket(kill, ThrottleOutPacketType.State);
1227 } 1227 }
1228 1228
1229 /// <summary> 1229 /// <summary>
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1817 sendXfer.XferID.ID = xferID; 1817 sendXfer.XferID.ID = xferID;
1818 sendXfer.XferID.Packet = packet; 1818 sendXfer.XferID.Packet = packet;
1819 sendXfer.DataPacket.Data = data; 1819 sendXfer.DataPacket.Data = data;
1820 OutPacket(sendXfer, ThrottleOutPacketType.Task); 1820 OutPacket(sendXfer, ThrottleOutPacketType.Asset);
1821 } 1821 }
1822 1822
1823 public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, 1823 public void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit,
@@ -2099,7 +2099,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
2099 packet.AgentData.SessionID = SessionId; 2099 packet.AgentData.SessionID = SessionId;
2100 packet.Header.Reliable = false; 2100 packet.Header.Reliable = false;
2101 packet.Header.Zerocoded = true; 2101 packet.Header.Zerocoded = true;
2102 OutPacket(packet, ThrottleOutPacketType.Task); 2102 OutPacket(packet, ThrottleOutPacketType.State);
2103 } 2103 }
2104 2104
2105 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember, 2105 public void SendAvatarProperties(UUID avatarID, string aboutText, string bornOn, Byte[] charterMember,
@@ -3122,7 +3122,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3122 3122
3123 avp.Sender.IsTrial = false; 3123 avp.Sender.IsTrial = false;
3124 avp.Sender.ID = agentID; 3124 avp.Sender.ID = agentID;
3125 OutPacket(avp, ThrottleOutPacketType.Task); 3125 OutPacket(avp, ThrottleOutPacketType.State);
3126 } 3126 }
3127 3127
3128 public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs) 3128 public void SendAnimations(UUID[] animations, int[] seqs, UUID sourceAgentId, UUID[] objectIDs)
@@ -3262,6 +3262,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3262 3262
3263 terse.Header.Reliable = false; 3263 terse.Header.Reliable = false;
3264 terse.Header.Zerocoded = true; 3264 terse.Header.Zerocoded = true;
3265 // FIXME: Move this to ThrottleOutPacketType.State when the real prioritization code is committed
3265 OutPacket(terse, ThrottleOutPacketType.Task); 3266 OutPacket(terse, ThrottleOutPacketType.Task);
3266 3267
3267 if (m_avatarTerseUpdates.Count == 0) 3268 if (m_avatarTerseUpdates.Count == 0)
@@ -3506,7 +3507,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3506 } 3507 }
3507 3508
3508 outPacket.Header.Zerocoded = true; 3509 outPacket.Header.Zerocoded = true;
3509 OutPacket(outPacket, ThrottleOutPacketType.Task); 3510 OutPacket(outPacket, ThrottleOutPacketType.State);
3510 3511
3511 if (m_primFullUpdates.Count == 0 && m_primFullUpdateTimer.Enabled) 3512 if (m_primFullUpdates.Count == 0 && m_primFullUpdateTimer.Enabled)
3512 lock (m_primFullUpdateTimer) 3513 lock (m_primFullUpdateTimer)
@@ -3596,7 +3597,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3596 3597
3597 outPacket.Header.Reliable = false; 3598 outPacket.Header.Reliable = false;
3598 outPacket.Header.Zerocoded = true; 3599 outPacket.Header.Zerocoded = true;
3599 OutPacket(outPacket, ThrottleOutPacketType.Task); 3600 OutPacket(outPacket, ThrottleOutPacketType.State);
3600 3601
3601 if (m_primTerseUpdates.Count == 0) 3602 if (m_primTerseUpdates.Count == 0)
3602 lock (m_primTerseUpdateTimer) 3603 lock (m_primTerseUpdateTimer)