diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index f4281e5..31ffc4d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -354,18 +354,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
354 | continue; | 354 | continue; |
355 | } | 355 | } |
356 | 356 | ||
357 | PresenceInfo presence = null; | ||
358 | PresenceInfo[] presences = PresenceService.GetAgents(new string[] { fid }); | ||
359 | if (presences != null && presences.Length > 0) | ||
360 | presence = presences[0]; | ||
361 | im.offline = 0; | 357 | im.offline = 0; |
362 | |||
363 | im.fromAgentID = fromAgentID.Guid; | 358 | im.fromAgentID = fromAgentID.Guid; |
364 | im.fromAgentName = firstname + " " + lastname; | 359 | im.fromAgentName = firstname + " " + lastname; |
365 | im.imSessionID = im.fromAgentID; | 360 | im.imSessionID = im.fromAgentID; |
366 | im.message = FriendshipMessage(fid); | 361 | im.message = FriendshipMessage(fid); |
367 | 362 | ||
368 | // Finally | ||
369 | LocalFriendshipOffered(agentID, im); | 363 | LocalFriendshipOffered(agentID, im); |
370 | } | 364 | } |
371 | 365 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs index 3ad691a..942091c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/Tests/FriendModuleTests.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends.Tests | |||
85 | UUID user2Id = TestHelpers.ParseTail(0x2); | 85 | UUID user2Id = TestHelpers.ParseTail(0x2); |
86 | 86 | ||
87 | ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId); | 87 | ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId); |
88 | ScenePresence sp2 = SceneHelpers.AddScenePresence(m_scene, user2Id); | 88 | SceneHelpers.AddScenePresence(m_scene, user2Id); |
89 | 89 | ||
90 | // This friendship is currently only one-way, which might be pathalogical in Second Life. | 90 | // This friendship is currently only one-way, which might be pathalogical in Second Life. |
91 | m_fm.AddFriend(sp.ControllingClient, user2Id); | 91 | m_fm.AddFriend(sp.ControllingClient, user2Id); |