Merge branch 'master' into presence-refactor

This was a large, heavily conflicted merge and things MAY have got broken.
Please check!

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
 
         public void SendKillObject(ulong regionHandle, uint localID)
         {
+//            m_log.DebugFormat("[CLIENT]: Sending KillObjectPacket to {0} for {1} in {2}", Name, localID, regionHandle);
+            
             KillObjectPacket kill = (KillObjectPacket)PacketPool.Instance.GetPacket(PacketType.KillObject);
             // TODO: don't create new blocks if recycling an old packet
             kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
@@ -3478,6 +3480,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         public void SendPrimitiveToClient(SendPrimitiveData data)
         {
+//            string text = data.text;
+//            if (text.IndexOf("\n") >= 0)
+//                text = text.Remove(text.IndexOf("\n"));
+//            m_log.DebugFormat(
+//                "[CLIENT]: Placing request to send full info about prim {0} text {1} to client {2}", 
+//                data.localID, text, Name);
+            
             if (data.priority == double.NaN)
             {
                 m_log.Error("[LLClientView] SendPrimitiveToClient received a NaN priority, dropping update");
@@ -3515,7 +3524,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
                 outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[count];
                 for (int i = 0; i < count; i++)
+                {
                     outPacket.ObjectData[i] = m_primFullUpdates.Dequeue();
+
+//                    string text = Util.FieldToString(outPacket.ObjectData[i].Text);
+//                    if (text.IndexOf("\n") >= 0)
+//                        text = text.Remove(text.IndexOf("\n"));
+//                    m_log.DebugFormat(
+//                        "[CLIENT]: Sending full info about prim {0} text {1} to client {2}", 
+//                        outPacket.ObjectData[i].ID, text, Name);
+                }
             }
 
             OutPacket(outPacket, ThrottleOutPacketType.State);
@@ -5173,6 +5191,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         {
             ScriptDialogReplyPacket rdialog = (ScriptDialogReplyPacket)Pack;
 
+            //m_log.DebugFormat("[CLIENT]: Received ScriptDialogReply from {0}", rdialog.Data.ObjectID);
+            
             #region Packet Session and User Check
             if (m_checkPackets)
             {
@@ -5193,7 +5213,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 args.Type = ChatTypeEnum.Shout;
                 args.Position = new Vector3();
                 args.Scene = Scene;
-                args.Sender = this;
+                args.Sender = this;                
                 ChatMessage handlerChatFromClient2 = OnChatFromClient;
                 if (handlerChatFromClient2 != null)
                     handlerChatFromClient2(this, args);
@@ -9095,8 +9115,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         
         private bool HandleSendPostcard(IClientAPI client, Packet packet)
         {
-            SendPostcardPacket SendPostcard =
-                (SendPostcardPacket)packet;
+//            SendPostcardPacket SendPostcard =
+//                (SendPostcardPacket)packet;
             SendPostcard handlerSendPostcard = OnSendPostcard;
             if (handlerSendPostcard != null)
             {