diff options
| author | Melanie | 2011-01-02 01:29:22 +0100 |
|---|---|---|
| committer | Melanie | 2011-01-03 19:42:46 +0000 |
| commit | 07cc032081e10495bcaa6c586fe7de3b1cf55916 (patch) | |
| tree | f1e2e8f5fc32f5fc94be4c379c141434f8f4d45a /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
| parent | Fix child agent scoping (diff) | |
| download | opensim-SC_OLD-07cc032081e10495bcaa6c586fe7de3b1cf55916.zip opensim-SC_OLD-07cc032081e10495bcaa6c586fe7de3b1cf55916.tar.gz opensim-SC_OLD-07cc032081e10495bcaa6c586fe7de3b1cf55916.tar.bz2 opensim-SC_OLD-07cc032081e10495bcaa6c586fe7de3b1cf55916.tar.xz | |
Allow cross-scope friendships to work, and also allow other cross scope name
resolution
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 489 | im.imSessionID = im.fromAgentID; | 489 | im.imSessionID = im.fromAgentID; |
| 490 | 490 | ||
| 491 | // Try the local sim | 491 | // Try the local sim |
| 492 | UserAccount account = UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, agentID); | 492 | UserAccount account = UserAccountService.GetUserAccount(UUID.Zero, agentID); |
| 493 | im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; | 493 | im.fromAgentName = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; |
| 494 | 494 | ||
| 495 | if (LocalFriendshipOffered(friendID, im)) | 495 | if (LocalFriendshipOffered(friendID, im)) |