aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-02-25 16:11:28 -0800
committerDiva Canto2010-02-25 16:11:28 -0800
commitba38b3b2dfb735fcefd6e5f7565a474361e9ad52 (patch)
treed482d7648594f76fdbb73bc2b75434bd5c1cb0f8
parentList of friends now retrieved upon login. Configured and tested in standalone... (diff)
parentCheck flags on initial login (diff)
downloadopensim-SC_OLD-ba38b3b2dfb735fcefd6e5f7565a474361e9ad52.zip
opensim-SC_OLD-ba38b3b2dfb735fcefd6e5f7565a474361e9ad52.tar.gz
opensim-SC_OLD-ba38b3b2dfb735fcefd6e5f7565a474361e9ad52.tar.bz2
opensim-SC_OLD-ba38b3b2dfb735fcefd6e5f7565a474361e9ad52.tar.xz
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 7c81d6a..e654b1f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -325,7 +325,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
325 List<string> friendList = new List<string>(); 325 List<string> friendList = new List<string>();
326 326
327 foreach (FriendInfo fi in m_Friends[agentID].Friends) 327 foreach (FriendInfo fi in m_Friends[agentID].Friends)
328 friendList.Add(fi.Friend); 328 {
329 if ((fi.TheirFlags & 1) != 0)
330 friendList.Add(fi.Friend);
331 }
329 332
330 PresenceInfo[] presence = PresenceService.GetAgents(friendList.ToArray()); 333 PresenceInfo[] presence = PresenceService.GetAgents(friendList.ToArray());
331 334