diff options
author | Diva Canto | 2010-06-19 12:32:36 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-19 12:32:36 -0700 |
commit | 24a68e36fb07e4366c8f9f680bcbbf85ac92b2f3 (patch) | |
tree | 78c20b5294c57a96f172616fb80c28377eb4ec86 /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
parent | Hunting for the problem in #4777 (diff) | |
download | opensim-SC_OLD-24a68e36fb07e4366c8f9f680bcbbf85ac92b2f3.zip opensim-SC_OLD-24a68e36fb07e4366c8f9f680bcbbf85ac92b2f3.tar.gz opensim-SC_OLD-24a68e36fb07e4366c8f9f680bcbbf85ac92b2f3.tar.bz2 opensim-SC_OLD-24a68e36fb07e4366c8f9f680bcbbf85ac92b2f3.tar.xz |
Bug fix: wrong name of requester in local friendship offer.
Diffstat (limited to '')
-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 80982fd..5552be7 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -503,7 +503,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
503 | UUID principalID = new UUID(im.fromAgentID); | 503 | UUID principalID = new UUID(im.fromAgentID); |
504 | UUID friendID = new UUID(im.toAgentID); | 504 | UUID friendID = new UUID(im.toAgentID); |
505 | 505 | ||
506 | m_log.DebugFormat("[FRIENDS]: {0} offered friendship to {1}", principalID, friendID); | 506 | m_log.DebugFormat("[FRIENDS]: {0} ({1}) offered friendship to {2}", principalID, im.fromAgentName, friendID); |
507 | 507 | ||
508 | // This user wants to be friends with the other user. | 508 | // This user wants to be friends with the other user. |
509 | // Let's add the relation backwards, in case the other is not online | 509 | // Let's add the relation backwards, in case the other is not online |
@@ -521,6 +521,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
521 | im.imSessionID = im.fromAgentID; | 521 | im.imSessionID = im.fromAgentID; |
522 | 522 | ||
523 | // Try the local sim | 523 | // Try the local sim |
524 | UserAccount account = UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, agentID); | ||
525 | im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; | ||
526 | |||
524 | if (LocalFriendshipOffered(friendID, im)) | 527 | if (LocalFriendshipOffered(friendID, im)) |
525 | return; | 528 | return; |
526 | 529 | ||