aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs22
1 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 68f7446..33210d7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1450,6 +1450,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1450 1450
1451 public void SendKillObject(ulong regionHandle, uint localID) 1451 public void SendKillObject(ulong regionHandle, uint localID)
1452 { 1452 {
1453// m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
1454
1453 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); 1455 KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
1454 // TODO: don't create new blocks if recycling an old packet 1456 // TODO: don't create new blocks if recycling an old packet
1455 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; 1457 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
@@ -3455,6 +3457,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3455 3457
3456 public void SendPrimitiveToClient(SendPrimitiveData data) 3458 public void SendPrimitiveToClient(SendPrimitiveData data)
3457 { 3459 {
3460// string text = data.text;
3461// if (text.IndexOf("\n") >= 0)
3462// text = text.Remove(text.IndexOf("\n"));
3463// m_log.DebugFormat(
3464// "[CLIENT]: Placing request to send full info about prim {0} text {1} to client {2}",
3465// data.localID, text, Name);
3466
3458 if (data.priority == double.NaN) 3467 if (data.priority == double.NaN)
3459 { 3468 {
3460 m_log.Error("[LLClientView] SendPrimitiveToClient received a NaN priority, dropping update"); 3469 m_log.Error("[LLClientView] SendPrimitiveToClient received a NaN priority, dropping update");
@@ -3492,7 +3501,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3492 3501
3493 outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[count]; 3502 outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[count];
3494 for (int i = 0; i < count; i++) 3503 for (int i = 0; i < count; i++)
3504 {
3495 outPacket.ObjectData[i] = m_primFullUpdates.Dequeue(); 3505 outPacket.ObjectData[i] = m_primFullUpdates.Dequeue();
3506
3507// string text = Util.FieldToString(outPacket.ObjectData[i].Text);
3508// if (text.IndexOf("\n") >= 0)
3509// text = text.Remove(text.IndexOf("\n"));
3510// m_log.DebugFormat(
3511// "[CLIENT]: Sending full info about prim {0} text {1} to client {2}",
3512// outPacket.ObjectData[i].ID, text, Name);
3513 }
3496 } 3514 }
3497 3515
3498 OutPacket(outPacket, ThrottleOutPacketType.State); 3516 OutPacket(outPacket, ThrottleOutPacketType.State);
@@ -9075,8 +9093,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
9075 9093
9076 private bool HandleSendPostcard(IClientAPI client, Packet packet) 9094 private bool HandleSendPostcard(IClientAPI client, Packet packet)
9077 { 9095 {
9078 SendPostcardPacket SendPostcard = 9096// SendPostcardPacket SendPostcard =
9079 (SendPostcardPacket)packet; 9097// (SendPostcardPacket)packet;
9080 SendPostcard handlerSendPostcard = OnSendPostcard; 9098 SendPostcard handlerSendPostcard = OnSendPostcard;
9081 if (handlerSendPostcard != null) 9099 if (handlerSendPostcard != null)
9082 { 9100 {