From 07cc032081e10495bcaa6c586fe7de3b1cf55916 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Sun, 2 Jan 2011 01:29:22 +0100
Subject: Allow cross-scope friendships to work, and also allow other cross
 scope name resolution

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

(limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index b3f0a25..4d74b2a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -489,7 +489,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             im.imSessionID = im.fromAgentID;
 
             // Try the local sim
-            UserAccount account = UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, agentID);
+            UserAccount account = UserAccountService.GetUserAccount(UUID.Zero, agentID);
             im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
             
             if (LocalFriendshipOffered(friendID, im))
-- 
cgit v1.1