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

OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs

@@ -1119,9 +1119,9 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                 }
                 else
                 {
-                    PresenceInfo[] pinfos = m_app.SceneManager.CurrentOrFirstScene.PresenceService.GetAgents(new string[] { account.PrincipalID.ToString() });
+                    GridUserInfo guinfo = m_app.SceneManager.CurrentOrFirstScene.GridUserService.GetGridUserInfo(account.PrincipalID.ToString());
-                    if (pinfos != null && pinfos.Length >= 1)
+                    if (guinfo != null)
-                        responseData["lastlogin"] = pinfos[0].Login;
+                        responseData["lastlogin"] = guinfo.Login;
                     else
                         responseData["lastlogin"] = 0;
 

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);
-                }
-            }
 
             return online;
         }
@@ -462,12 +459,15 @@ 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 (friendSessions != null && friendSessions.Length > 0)
+                {
+                    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 (friendSessions != null && friendSessions.Length > 0)
+            {
+                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 (friendSessions != null && friendSessions.Length > 0)
+            {
+                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,13 +566,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 return;
 
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { friendID.ToString() });
-            PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
+            if (friendSessions != null && friendSessions.Length > 0)
+            {
+                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);
                 }
             }
+        }
 
         private void OnTerminateFriendship(IClientAPI client, UUID agentID, UUID exfriendID)
         {
@@ -589,13 +596,16 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 return;
 
             PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() });
-            PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
+            if (friendSessions != null && friendSessions.Length > 0)
+            {
+                PresenceInfo friendSession = friendSessions[0];
                 if (friendSession != null)
                 {
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
                     m_FriendsSimConnector.FriendshipTerminated(region, agentID, exfriendID);
                 }
             }
+        }
 
         private void OnGrantUserRights(IClientAPI remoteClient, UUID requester, UUID target, int rights)
         {
@@ -631,7 +641,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     return;
 
                 PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { target.ToString() });
-                PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
+                if (friendSessions != null && friendSessions.Length > 0)
+                {
+                    PresenceInfo friendSession = friendSessions[0];
                     if (friendSession != null)
                     {
                         GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
@@ -641,6 +653,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                     }
                 }
             }
+        }
 
         #region Local
 

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)
+                if (presences != null && presences.Length > 0)
-                {
-                    foreach (PresenceInfo p in presences)
-                        if (p.Online)
-                        {
                     upd = presences[0];
-                            break;
-                        }
-                }
 
                 if (upd != null)
                 {
@@ -524,8 +516,6 @@ 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);
@@ -577,12 +567,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
                 HandleUndeliveredMessage(im, result);
             }
         }
-            else
-            {
-                m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find user {0}", toAgentID);
-                HandleUndeliveredMessage(im, result);
-            }
-        }
 
         /// <summary>
         /// This actually does the XMLRPC Request

OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs

@@ -133,21 +133,15 @@ 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);
             }
-                }
+            foreach (string s in args)
-                else
             {
+                UUID uuid = new UUID(s);
                 if (!online.Contains(uuid) && !offline.Contains(uuid))
                     offline.Add(uuid);
             }
-            }
 
             if (online.Count > 0)
                 client.SendAgentOnline(online.ToArray());

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -3884,8 +3884,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
 
             UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, uuid);
 
+            PresenceInfo pinfo = null;
             PresenceInfo[] pinfos = World.PresenceService.GetAgents(new string[] { uuid.ToString() });
-            PresenceInfo pinfo = PresenceInfo.GetOnlinePresence(pinfos);
+            if (pinfos != null && pinfos.Length > 0)
+                pinfo = pinfos[0];
 
             if (pinfo == null)
                 return UUID.Zero.ToString();

OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs

@@ -511,20 +511,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
 
             PresenceInfo info = new PresenceInfo();
 
-            info.Online = true;
             info.UserID = sessionResponse["UserID"].AsUUID().ToString();
             info.RegionID = sessionResponse["SceneID"].AsUUID();
-            info.Position = sessionResponse["ScenePosition"].AsVector3();
-            info.LookAt = sessionResponse["SceneLookAt"].AsVector3();
-
-            if (userResponse != null && userResponse["User"] is OSDMap)
-            {
-                OSDMap user = (OSDMap)userResponse["User"];
-
-                info.Login = user["LastLoginDate"].AsDate();
-                info.Logout = user["LastLogoutDate"].AsDate();
-                DeserializeLocation(user["HomeLocation"].AsString(), out info.HomeRegionID, out info.HomePosition, out info.HomeLookAt);
-            }
 
             return info;
         }

OpenSim/Services/Interfaces/IPresenceService.cs

@@ -36,14 +36,6 @@ namespace OpenSim.Services.Interfaces
     {
         public string UserID;
         public UUID RegionID;
-        public bool Online;
-        public DateTime Login;
-        public DateTime Logout;
-        public Vector3 Position;
-        public Vector3 LookAt;
-        public UUID HomeRegionID;
-        public Vector3 HomePosition;
-        public Vector3 HomeLookAt;
 
         public PresenceInfo()
         {
@@ -65,26 +57,6 @@ namespace OpenSim.Services.Interfaces
 
             return result;
         }
-
-        public static PresenceInfo[] GetOnlinePresences(PresenceInfo[] pinfos)
-        {
-            if (pinfos == null)
-                return null;
-
-            List<PresenceInfo> lst = new List<PresenceInfo>(pinfos);
-            lst = lst.FindAll(delegate(PresenceInfo each) { return each.Online; });
-
-            return lst.ToArray();
-        }
-
-        public static PresenceInfo GetOnlinePresence(PresenceInfo[] pinfos)
-        {
-            pinfos = GetOnlinePresences(pinfos);
-            if (pinfos != null && pinfos.Length >= 1)
-                return pinfos[0];
-
-            return null;
-        }
     }
 
     public interface IPresenceService

OpenSim/Services/PresenceService/PresenceService.cs

@@ -115,10 +115,6 @@ namespace OpenSim.Services.PresenceService
 
             ret.UserID = data.UserID;
             ret.RegionID = data.RegionID;
-            if (data.Data.ContainsKey("Position"))
-                ret.Position = Vector3.Parse(data.Data["Position"]);
-            if (data.Data.ContainsKey("LookAt"))
-                ret.LookAt = Vector3.Parse(data.Data["LookAt"]);
 
             return ret;
         }
@@ -138,8 +134,6 @@ namespace OpenSim.Services.PresenceService
 
                     ret.UserID = d.UserID;
                     ret.RegionID = d.RegionID;
-                    ret.Position = Vector3.Parse(d.Data["Position"]);
-                    ret.LookAt = Vector3.Parse(d.Data["LookAt"]);
 
                     info.Add(ret);
                 }

OpenSim/Tests/Clients/Presence/PresenceClient.cs

@@ -73,8 +73,8 @@ namespace OpenSim.Tests.Clients.PresenceClient
             if (pinfo == null)
                 m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0}", user1);
             else
-                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}", 
+                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; regionID={1}", 
-                    pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
+                    pinfo.UserID, pinfo.RegionID);
 
             System.Console.WriteLine("\n");
             success = m_Connector.ReportAgent(session1, region1);
@@ -86,8 +86,8 @@ namespace OpenSim.Tests.Clients.PresenceClient
             if (pinfo == null)
                 m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for second time", user1);
             else
-                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
+                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; regionID={2}",
-                    pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
+                    pinfo.UserID, pinfo.RegionID);
 
             System.Console.WriteLine("\n");
             success = m_Connector.LogoutAgent(session1);
@@ -99,8 +99,8 @@ namespace OpenSim.Tests.Clients.PresenceClient
             if (pinfo == null)
                 m_log.InfoFormat("[PRESENCE CLIENT]: Unable to retrieve presence for {0} for fourth time", user1);
             else
-                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; Online={1}; regionID={2}; homeRegion={3}",
+                m_log.InfoFormat("[PRESENCE CLIENT]: Presence retrieved correctly: userID={0}; regionID={1}",
-                    pinfo.UserID, pinfo.Online, pinfo.RegionID, pinfo.HomeRegionID);
+                    pinfo.UserID, pinfo.RegionID);
 
             System.Console.WriteLine("\n");
             success = m_Connector.ReportAgent(session1, UUID.Random());