diff options
| author | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2011-11-03 20:12:10 +0000 |
| commit | a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec (patch) | |
| tree | f26aa58d3a31ea6460a9cb76cc70a2ccb34945cc /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
| parent | Change default say distance to 20m from 30m, the same as on the big grid. Th... (diff) | |
| parent | Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size (diff) | |
| download | opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.zip opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.gz opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.bz2 opensim-SC_OLD-a62ccb5c4c24681a283ad236db2e4bd08fc5e1ec.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 1da9aab..c952ebf 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
| @@ -356,12 +356,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 356 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); | 356 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); |
| 357 | if (presences != null && presences.Length > 0) | 357 | if (presences != null && presences.Length > 0) |
| 358 | presence = presences[0]; | 358 | presence = presences[0]; |
| 359 | if (presence != null) | 359 | im.offline = 0; |
| 360 | im.offline = 0; | ||
| 361 | 360 | ||
| 362 | im.fromAgentID = fromAgentID.Guid; | 361 | im.fromAgentID = fromAgentID.Guid; |
| 363 | im.fromAgentName = firstname + " " + lastname; | 362 | im.fromAgentName = firstname + " " + lastname; |
| 364 | im.offline = (byte)((presence == null) ? 1 : 0); | ||
| 365 | im.imSessionID = im.fromAgentID; | 363 | im.imSessionID = im.fromAgentID; |
| 366 | im.message = FriendshipMessage(fid); | 364 | im.message = FriendshipMessage(fid); |
| 367 | 365 | ||