Friends online notifications upon friendship now working (same sim only).

1 files changed, 14 insertions, 2 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index 4e57394..bafad82 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -123,6 +123,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 return;
 
             IClientAPI client = (IClientAPI)sender;
+            m_log.DebugFormat("[PRESENCE MODULE]: OnlineNotification requested by {0}", client.Name);
 
             PresenceInfo[] status = PresenceService.GetAgents(args.ToArray());
 
@@ -131,10 +132,21 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
 
             foreach (PresenceInfo pi in status)
             {
+                UUID uuid = new UUID(pi.UserID);
                 if (pi.Online)
-                    online.Add(new UUID(pi.UserID));
+                {
+                    if (!online.Contains(uuid))
+                    {
+                        online.Add(uuid);
+                        if (offline.Contains(uuid))
+                            offline.Remove(uuid);
+                    }
+                }
                 else
-                    offline.Add(new UUID(pi.UserID));
+                {
+                    if (!online.Contains(uuid) && !offline.Contains(uuid))
+                        offline.Add(uuid);
+                }
             }
 
             if (online.Count > 0)