diff options
author | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
---|---|---|
committer | Jonathan Freedman | 2010-10-05 14:17:18 -0400 |
commit | 8f1acb890ac49ea004bf43065ce8d3472bb27708 (patch) | |
tree | 07e4e5fc77f764232c958bdbf8f93f2651da1663 /OpenSim/Region/CoreModules/Avatar/Friends | |
parent | Merge branch 'master' of git://opensimulator.org/git/opensim (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-8f1acb890ac49ea004bf43065ce8d3472bb27708.zip opensim-SC-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.gz opensim-SC-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.bz2 opensim-SC-8f1acb890ac49ea004bf43065ce8d3472bb27708.tar.xz |
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 7a21d5e..b3f0a25 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -318,12 +318,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
318 | 318 | ||
319 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID); | 319 | UserAccount account = m_Scenes[0].UserAccountService.GetUserAccount(client.Scene.RegionInfo.ScopeID, fromAgentID); |
320 | 320 | ||
321 | PresenceInfo presence = null; | 321 | PresenceInfo presence = null; |
322 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); | 322 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); |
323 | if (presences != null && presences.Length > 0) | 323 | if (presences != null && presences.Length > 0) |
324 | presence = presences[0]; | 324 | presence = presences[0]; |
325 | if (presence != null) | 325 | if (presence != null) |
326 | im.offline = 0; | 326 | im.offline = 0; |
327 | 327 | ||
328 | im.fromAgentID = fromAgentID.Guid; | 328 | im.fromAgentID = fromAgentID.Guid; |
329 | im.fromAgentName = account.FirstName + " " + account.LastName; | 329 | im.fromAgentName = account.FirstName + " " + account.LastName; |