diff options
| author | Melanie | 2010-10-06 00:27:10 +0100 |
|---|---|---|
| committer | Melanie | 2010-10-06 00:27:10 +0100 |
| commit | d8149373c15d9ec39c0f836a337e58b633f45829 (patch) | |
| tree | 3678027b5eb7f1cdfb29b1c0c80bd0c3d7a62ae6 /OpenSim/Region/CoreModules/Avatar/Friends | |
| parent | Avoid throwing errors when adding existing meshes to the render scene (diff) | |
| parent | Remove sirikata project (diff) | |
| download | opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.zip opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.gz opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.bz2 opensim-SC_OLD-d8149373c15d9ec39c0f836a337e58b633f45829.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 21ed9dc..45c3f49 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; |