diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index b888017..4e2a0b7 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1471,6 +1471,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1471 | 1471 | ||
1472 | public void SendKillObject(ulong regionHandle, uint localID) | 1472 | public void SendKillObject(ulong regionHandle, uint localID) |
1473 | { | 1473 | { |
1474 | // m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle); | ||
1475 | |||
1474 | KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); | 1476 | KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject); |
1475 | // TODO: don't create new blocks if recycling an old packet | 1477 | // TODO: don't create new blocks if recycling an old packet |
1476 | kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; | 1478 | kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1]; |
@@ -3478,6 +3480,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3478 | 3480 | ||
3479 | public void SendPrimitiveToClient(SendPrimitiveData data) | 3481 | public void SendPrimitiveToClient(SendPrimitiveData data) |
3480 | { | 3482 | { |
3483 | // string text = data.text; | ||
3484 | // if (text.IndexOf("\n") >= 0) | ||
3485 | // text = text.Remove(text.IndexOf("\n")); | ||
3486 | // m_log.DebugFormat( | ||
3487 | // "[CLIENT]: Placing request to send full info about prim {0} text {1} to client {2}", | ||
3488 | // data.localID, text, Name); | ||
3489 | |||
3481 | if (data.priority == double.NaN) | 3490 | if (data.priority == double.NaN) |
3482 | { | 3491 | { |
3483 | m_log.Error("[LLClientView] SendPrimitiveToClient received a NaN priority, dropping update"); | 3492 | m_log.Error("[LLClientView] SendPrimitiveToClient received a NaN priority, dropping update"); |
@@ -3515,7 +3524,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
3515 | 3524 | ||
3516 | outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[count]; | 3525 | outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[count]; |
3517 | for (int i = 0; i < count; i++) | 3526 | for (int i = 0; i < count; i++) |
3527 | { | ||
3518 | outPacket.ObjectData[i] = m_primFullUpdates.Dequeue(); | 3528 | outPacket.ObjectData[i] = m_primFullUpdates.Dequeue(); |
3529 | |||
3530 | // string text = Util.FieldToString(outPacket.ObjectData[i].Text); | ||
3531 | // if (text.IndexOf("\n") >= 0) | ||
3532 | // text = text.Remove(text.IndexOf("\n")); | ||
3533 | // m_log.DebugFormat( | ||
3534 | // "[CLIENT]: Sending full info about prim {0} text {1} to client {2}", | ||
3535 | // outPacket.ObjectData[i].ID, text, Name); | ||
3536 | } | ||
3519 | } | 3537 | } |
3520 | 3538 | ||
3521 | OutPacket(outPacket, ThrottleOutPacketType.State); | 3539 | OutPacket(outPacket, ThrottleOutPacketType.State); |
@@ -5173,6 +5191,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5173 | { | 5191 | { |
5174 | ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; | 5192 | ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack; |
5175 | 5193 | ||
5194 | //m_log.DebugFormat("[CLIENT]: Received ScriptDialogReply from {0}", rdialog.Data.ObjectID); | ||
5195 | |||
5176 | #region Packet Session and User Check | 5196 | #region Packet Session and User Check |
5177 | if (m_checkPackets) | 5197 | if (m_checkPackets) |
5178 | { | 5198 | { |
@@ -5193,7 +5213,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
5193 | args.Type = ChatTypeEnum.Shout; | 5213 | args.Type = ChatTypeEnum.Shout; |
5194 | args.Position = new Vector3(); | 5214 | args.Position = new Vector3(); |
5195 | args.Scene = Scene; | 5215 | args.Scene = Scene; |
5196 | args.Sender = this; | 5216 | args.Sender = this; |
5197 | ChatMessage handlerChatFromClient2 = OnChatFromClient; | 5217 | ChatMessage handlerChatFromClient2 = OnChatFromClient; |
5198 | if (handlerChatFromClient2 != null) | 5218 | if (handlerChatFromClient2 != null) |
5199 | handlerChatFromClient2(this, args); | 5219 | handlerChatFromClient2(this, args); |
@@ -9095,8 +9115,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
9095 | 9115 | ||
9096 | private bool HandleSendPostcard(IClientAPI client, Packet packet) | 9116 | private bool HandleSendPostcard(IClientAPI client, Packet packet) |
9097 | { | 9117 | { |
9098 | SendPostcardPacket SendPostcard = | 9118 | // SendPostcardPacket SendPostcard = |
9099 | (SendPostcardPacket)packet; | 9119 | // (SendPostcardPacket)packet; |
9100 | SendPostcard handlerSendPostcard = OnSendPostcard; | 9120 | SendPostcard handlerSendPostcard = OnSendPostcard; |
9101 | if (handlerSendPostcard != null) | 9121 | if (handlerSendPostcard != null) |
9102 | { | 9122 | { |