More cleaning on presence. Friends online/offline works again.

3 files changed, 89 insertions, 98 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index febd4ca..0c81f44 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -345,8 +345,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                         UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, new UUID(im.fromAgentID));
                         im.fromAgentName = account.FirstName + " " + account.LastName;
 
+                        PresenceInfo presence = null;
                         PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid });
-                        PresenceInfo presence = PresenceInfo.GetOnlinePresence(presences);
+                        if (presences != null && presences.Length > 0)
+                            presence = presences[0];
                         if (presence != null)
                             im.offline = 0;
 
@@ -380,13 +382,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             PresenceInfo[] presence = PresenceService.GetAgents(friendList.ToArray());
 
             foreach (PresenceInfo pi in presence)
-            {
-                if (pi.Online)
-                {
-                    online.Add(new UUID(pi.UserID));
-                    //m_log.DebugFormat("[XXX] {0} friend online {1}", userID, pi.UserID);
-                }
-            }
+                online.Add(new UUID(pi.UserID));
+                //m_log.DebugFormat("[XXX] {0} friend online {1}", userID, pi.UserID);
 
             return online;
         }
@@ -462,11 +459,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 
                 // The friend is not here [as root]. Let's forward.
                 PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
-                PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
-                if (friendSession != null)
+                if (friendSessions != null && friendSessions.Length > 0)
                 {
-                    GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                    m_FriendsSimConnector.StatusNotify(region, userID, friendID, online);
+                    PresenceInfo friendSession = friendSessions[0];
+                    if (friendSession != null)
+                    {
+                        GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                        m_FriendsSimConnector.StatusNotify(region, userID, friendID, online);
+                    }
                 }
 
                 // Friend is not online. Ignore.
@@ -504,13 +504,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             // The prospective friend is not here [as root]. Let's forward.
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
-            PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
-            if (friendSession != null)
+            if (friendSessions != null && friendSessions.Length > 0)
             {
-                GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                m_FriendsSimConnector.FriendshipOffered(region, agentID, friendID, im.message);
+                PresenceInfo friendSession = friendSessions[0];
+                if (friendSession != null)
+                {
+                    GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                    m_FriendsSimConnector.FriendshipOffered(region, agentID, friendID, im.message);
+                }
             }
-
             // If the prospective friend is not online, he'll get the message upon login.
         }
 
@@ -536,14 +538,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             // The friend is not here
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
-            PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
-            if (friendSession != null)
+            if (friendSessions != null && friendSessions.Length > 0)
             {
-                GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                m_FriendsSimConnector.FriendshipApproved(region, agentID, client.Name, friendID);
-                client.SendAgentOnline(new UUID[] { friendID });
+                PresenceInfo friendSession = friendSessions[0];
+                if (friendSession != null)
+                {
+                    GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                    m_FriendsSimConnector.FriendshipApproved(region, agentID, client.Name, friendID);
+                    client.SendAgentOnline(new UUID[] { friendID });
+                }
             }
-
         }
 
         private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
@@ -562,11 +566,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 return;
 
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
-            PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
-            if (friendSession != null)
+            if (friendSessions != null && friendSessions.Length > 0)
             {
-                GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                m_FriendsSimConnector.FriendshipDenied(region, agentID, client.Name, friendID);
+                PresenceInfo friendSession = friendSessions[0];
+                if (friendSession != null)
+                {
+                    GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                    m_FriendsSimConnector.FriendshipDenied(region, agentID, client.Name, friendID);
+                }
             }
         }
 
@@ -589,11 +596,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 return;
 
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() });
-            PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
-            if (friendSession != null)
+            if (friendSessions != null && friendSessions.Length > 0)
             {
-                GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                m_FriendsSimConnector.FriendshipTerminated(region, agentID, exfriendID);
+                PresenceInfo friendSession = friendSessions[0];
+                if (friendSession != null)
+                {
+                    GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                    m_FriendsSimConnector.FriendshipTerminated(region, agentID, exfriendID);
+                }
             }
         }
 
@@ -631,13 +641,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     return;
 
                 PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { target.ToString() });
-                PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
-                if (friendSession != null)
+                if (friendSessions != null && friendSessions.Length > 0)
                 {
-                    GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                    // TODO: You might want to send the delta to save the lookup
-                    // on the other end!!
-                    m_FriendsSimConnector.GrantRights(region, requester, target, myFlags, rights);
+                    PresenceInfo friendSession = friendSessions[0];
+                    if (friendSession != null)
+                    {
+                        GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                        // TODO: You might want to send the delta to save the lookup
+                        // on the other end!!
+                        m_FriendsSimConnector.GrantRights(region, requester, target, myFlags, rights);
+                    }
                 }
             }
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index ad050a1..5d20e63 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -471,7 +471,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 if (m_UserRegionMap.ContainsKey(toAgentID))
                 {
                     upd = new PresenceInfo();
-                    upd.Online = true;
                     upd.RegionID = m_UserRegionMap[toAgentID];
 
                     // We need to compare the current regionhandle with the previous region handle
@@ -493,15 +492,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             {
                 // Non-cached user agent lookup.
                 PresenceInfo[] presences = PresenceService.GetAgents(new string[] { toAgentID.ToString() }); 
-                if (presences != null)
-                {
-                    foreach (PresenceInfo p in presences)
-                        if (p.Online)
-                        {
-                            upd = presences[0];
-                            break;
-                        }
-                }
+                if (presences != null && presences.Length > 0)
+                    upd = presences[0];
 
                 if (upd != null)
                 {
@@ -525,61 +517,53 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
             if (upd != null)
             {
-                if (upd.Online)
+                GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID,
+                    upd.RegionID);
+                if (reginfo != null)
                 {
-                    GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID,
-                        upd.RegionID);
-                    if (reginfo != null)
+                    Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im);
+                    // Not actually used anymore, left in for compatibility
+                    // Remove at next interface change
+                    //
+                    msgdata["region_handle"] = 0;
+                    bool imresult = doIMSending(reginfo, msgdata);
+                    if (imresult)
                     {
-                        Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im);
-                        // Not actually used anymore, left in for compatibility
-                        // Remove at next interface change
-                        //
-                        msgdata["region_handle"] = 0;
-                        bool imresult = doIMSending(reginfo, msgdata);
-                        if (imresult)
+                        // IM delivery successful, so store the Agent's location in our local cache.
+                        lock (m_UserRegionMap)
                         {
-                            // IM delivery successful, so store the Agent's location in our local cache.
-                            lock (m_UserRegionMap)
+                            if (m_UserRegionMap.ContainsKey(toAgentID))
                             {
-                                if (m_UserRegionMap.ContainsKey(toAgentID))
-                                {
-                                    m_UserRegionMap[toAgentID] = upd.RegionID;
-                                }
-                                else
-                                {
-                                    m_UserRegionMap.Add(toAgentID, upd.RegionID);
-                                }
+                                m_UserRegionMap[toAgentID] = upd.RegionID;
+                            }
+                            else
+                            {
+                                m_UserRegionMap.Add(toAgentID, upd.RegionID);
                             }
-                            result(true);
-                        }
-                        else
-                        {
-                            // try again, but lookup user this time.
-                            // Warning, this must call the Async version
-                            // of this method or we'll be making thousands of threads
-                            // The version within the spawned thread is SendGridInstantMessageViaXMLRPCAsync
-                            // The version that spawns the thread is SendGridInstantMessageViaXMLRPC
-
-                            // This is recursive!!!!!
-                            SendGridInstantMessageViaXMLRPCAsync(im, result,
-                                    upd.RegionID);
                         }
+                        result(true);
                     }
                     else
                     {
-                        m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", upd.RegionID);
-                        HandleUndeliveredMessage(im, result);
+                        // try again, but lookup user this time.
+                        // Warning, this must call the Async version
+                        // of this method or we'll be making thousands of threads
+                        // The version within the spawned thread is SendGridInstantMessageViaXMLRPCAsync
+                        // The version that spawns the thread is SendGridInstantMessageViaXMLRPC
+
+                        // This is recursive!!!!!
+                        SendGridInstantMessageViaXMLRPCAsync(im, result,
+                                upd.RegionID);
                     }
                 }
                 else
                 {
+                    m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", upd.RegionID);
                     HandleUndeliveredMessage(im, result);
                 }
             }
             else
             {
-                m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find user {0}", toAgentID);
                 HandleUndeliveredMessage(im, result);
             }
         }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index bafad82..dd17f3c 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -133,20 +133,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
             foreach (PresenceInfo pi in status)
             {
                 UUID uuid = new UUID(pi.UserID);
-                if (pi.Online)
-                {
-                    if (!online.Contains(uuid))
-                    {
-                        online.Add(uuid);
-                        if (offline.Contains(uuid))
-                            offline.Remove(uuid);
-                    }
-                }
-                else
-                {
-                    if (!online.Contains(uuid) && !offline.Contains(uuid))
-                        offline.Add(uuid);
-                }
+                if (!online.Contains(uuid))
+                    online.Add(uuid);
+            }
+            foreach (string s in args)
+            {
+                UUID uuid = new UUID(s);
+                if (!online.Contains(uuid) && !offline.Contains(uuid))
+                    offline.Add(uuid);
             }
 
             if (online.Count > 0)