* This should fix presence issues.

2 files changed, 9 insertions, 2 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index b7f1d90..0ef7f26 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5981,6 +5981,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 onpb[i] = onpbl;
             }
             onp.AgentBlock = onpb;
+            onp.Header.Reliable = true;
             OutPacket(onp, ThrottleOutPacketType.Task);
         }
 
@@ -5995,6 +5996,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 offpb[i] = onpbl;
             }
             offp.AgentBlock = offpb;
+            offp.Header.Reliable = true;
             OutPacket(offp, ThrottleOutPacketType.Task);
         }
 
diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index 92c808b..0762291 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -93,8 +93,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
 
         public XmlRpcResponse processPresenceUpdate(XmlRpcRequest req)
         {
-            m_log.Info("[FRIENDS]: Got Notification about a user! OMG");
+            //m_log.Info("[FRIENDS]: Got Notification about a user! OMG");
             Hashtable requestData = (Hashtable)req.Params[0];
+
             if (requestData.ContainsKey("agent_id") && requestData.ContainsKey("notify_id") && requestData.ContainsKey("status"))
             {
                 LLUUID notifyAgentId = LLUUID.Zero;
@@ -107,7 +108,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
                 Helpers.TryParse((string)requestData["notify_id"], out notifyAgentId);
 
                 Helpers.TryParse((string)requestData["agent_id"], out notifyAboutAgentId);
-
+                m_log.InfoFormat("[PRESENCE]: Got presence update for {0}, and we're telling {1}, with a status {2}", notifyAboutAgentId.ToString(), notifyAgentId.ToString(), notifyOnlineStatus.ToString());
                 ScenePresence avatar = GetPresenceFromAgentID(notifyAgentId);
                 if (avatar != null)
                 {
@@ -161,6 +162,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
                 }
 
             }
+            else
+            {
+                m_log.Warn("[PRESENCE]: Malformed XMLRPC Presence request");
+            }
             return new XmlRpcResponse();
         }