diff options
| author | Diva Canto | 2010-02-25 16:11:28 -0800 |
|---|---|---|
| committer | Diva Canto | 2010-02-25 16:11:28 -0800 |
| commit | ba38b3b2dfb735fcefd6e5f7565a474361e9ad52 (patch) | |
| tree | d482d7648594f76fdbb73bc2b75434bd5c1cb0f8 /OpenSim | |
| parent | List of friends now retrieved upon login. Configured and tested in standalone... (diff) | |
| parent | Check flags on initial login (diff) | |
| download | opensim-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
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 5 |
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 | ||