ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 09:16:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

try improve profiles online indication a bit more

Browse Source
This commit is contained in:
UbitUmarov
2023-02-01 21:09:20 +00:00
parent e2d71afc10
commit a7b8ce9cfd
3 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@@ -268,11 +268,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
friends = new HashSet<UUID>();
m_OnlineFriendsCache[userID] = friends;
}
foreach (UUID friendID in friendsOnline)
if (online)
{
if (online)
foreach (UUID friendID in friendsOnline)
friends.Add(friendID);
else
}
else
{
foreach (UUID friendID in friendsOnline)
friends.Remove(friendID);
}
}
@@ -374,6 +377,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
lock (m_Friends)
{
foreach(HashSet<UUID> friends in m_OnlineFriendsCache.Values)
friends.Remove(agentID);
m_OnlineFriendsCache.Remove(agentID);
if (m_Friends.TryGetValue(agentID, out UserFriendData friendsData))
{

12
OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
View File

@@ -238,10 +238,22 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
// FIXME: also query the presence status of friends in other grids (like in HGStatusNotifier.Notify())
PresenceInfo[] presence = PresenceService.GetAgents(fList.ToArray());
if (presence.Length == 0)
return;
if (!m_OnlineFriendsCache.TryGetValue(userID, out HashSet<UUID> friends))
{
friends = new HashSet<UUID>();
m_OnlineFriendsCache[userID] = friends;
}
foreach (PresenceInfo pi in presence)
{
if (UUID.TryParse(pi.UserID, out UUID presenceID))
{
online.Add(presenceID);
friends.Add(presenceID);
}
}
//m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetOnlineFriends for {0}", userID);

2
OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs
View File

@@ -1842,7 +1842,7 @@ namespace OpenSim.Region.CoreModules.Avatar.UserProfiles
if(client.SceneAgent is ScenePresence sp && sp.IsViewerUIGod)
{
Services.Interfaces.PresenceInfo[] pi = Scene.PresenceService?.GetAgents(new string[] { agent.ToString() });
return pi != null && pi.Length > 0;
return pi is not null && pi.Length > 0;
}
return false;
}