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/FriendsRequestHandler.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 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs index 496f2ab..1b53a42 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | |||
| @@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 116 | if (!UUID.TryParse(request["ToID"].ToString(), out toID)) | 116 | if (!UUID.TryParse(request["ToID"].ToString(), out toID)) |
| 117 | return FailureResult(); | 117 | return FailureResult(); |
| 118 | 118 | ||
| 119 | UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(m_FriendsModule.Scene.RegionInfo.ScopeID, fromID); | 119 | UserAccount account = m_FriendsModule.UserAccountService.GetUserAccount(UUID.Zero, fromID); |
| 120 | string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; | 120 | string name = (account == null) ? "Unknown" : account.FirstName + " " + account.LastName; |
| 121 | 121 | ||
| 122 | GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID, | 122 | GridInstantMessage im = new GridInstantMessage(m_FriendsModule.Scene, fromID, name, toID, |