From ab716125d7aa80efe2b3904490f10fd045da94c7 Mon Sep 17 00:00:00 2001
From: Tom Grimshaw <tom@meta7.com>
Date: Mon, 10 May 2010 05:51:49 -0700
Subject: [PATCH] Correct an odd merge anomaly

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 8f84d81a68..5dc9c4410d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -471,7 +471,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
             for (int x = 0; x < friendSessions.GetLength(0); x++)
             {
-                PresenceInfo friendSession = PresenceInfo.GetOnlinePresence(friendSessions);
+                PresenceInfo friendSession = friendSessions[x];
                 if (friendSession != null)
                 {
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);