aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
-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 4c01985..c6f8b88 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -504,7 +504,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
504 UUID principalID = new UUID(im.fromAgentID); 504 UUID principalID = new UUID(im.fromAgentID);
505 UUID friendID = new UUID(im.toAgentID); 505 UUID friendID = new UUID(im.toAgentID);
506 506
507 m_log.DebugFormat("[FRIENDS]: {0} offered friendship to {1}", principalID, friendID); 507 m_log.DebugFormat("[FRIENDS]: {0} ({1}) offered friendship to {2}", principalID, im.fromAgentName, friendID);
508 508
509 // This user wants to be friends with the other user. 509 // This user wants to be friends with the other user.
510 // Let's add the relation backwards, in case the other is not online 510 // Let's add the relation backwards, in case the other is not online
@@ -522,6 +522,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
522 im.imSessionID = im.fromAgentID; 522 im.imSessionID = im.fromAgentID;
523 523
524 // Try the local sim 524 // Try the local sim
525 UserAccount account = UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, agentID);
526 im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName;
527
525 if (LocalFriendshipOffered(friendID, im)) 528 if (LocalFriendshipOffered(friendID, im))
526 return; 529 return;
527 530