aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2010-02-27 08:14:37 -0800
committerDiva Canto2010-02-27 08:14:37 -0800
commitde5c2801e8c8c0274de97370531dc93f5c57077b (patch)
tree4520bef5891ec0b48c66de1cb2eec42e337c1327 /OpenSim
parent* Friendship offers starting to work in the same sim. Not quite right yet. (diff)
downloadopensim-SC_OLD-de5c2801e8c8c0274de97370531dc93f5c57077b.zip
opensim-SC_OLD-de5c2801e8c8c0274de97370531dc93f5c57077b.tar.gz
opensim-SC_OLD-de5c2801e8c8c0274de97370531dc93f5c57077b.tar.bz2
opensim-SC_OLD-de5c2801e8c8c0274de97370531dc93f5c57077b.tar.xz
Friendships established.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 1d7889d..1719447 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -377,6 +377,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
377 UUID principalID = new UUID(im.fromAgentID); 377 UUID principalID = new UUID(im.fromAgentID);
378 UUID friendID = new UUID(im.toAgentID); 378 UUID friendID = new UUID(im.toAgentID);
379 379
380 m_log.DebugFormat("[FRIENDS]: {0} offered friendship to {1}", principalID, friendID);
381
380 // This user wants to be friends with the other user. 382 // This user wants to be friends with the other user.
381 // Let's add both relations to the DB, but one of them is inactive (-1) 383 // Let's add both relations to the DB, but one of them is inactive (-1)
382 FriendsService.StoreFriend(principalID, friendID.ToString(), 1); 384 FriendsService.StoreFriend(principalID, friendID.ToString(), 1);
@@ -389,6 +391,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
389 391
390 private void ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im) 392 private void ForwardFriendshipOffer(UUID agentID, UUID friendID, GridInstantMessage im)
391 { 393 {
394 // !!!!!!!!
395 im.imSessionID = im.fromAgentID;
396
392 IClientAPI friendClient = LocateClientObject(friendID); 397 IClientAPI friendClient = LocateClientObject(friendID);
393 if (friendClient != null) 398 if (friendClient != null)
394 { 399 {
@@ -414,6 +419,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
414 { 419 {
415 FriendsService.StoreFriend(agentID, friendID.ToString(), 1); 420 FriendsService.StoreFriend(agentID, friendID.ToString(), 1);
416 421
422 m_log.DebugFormat("[FRIENDS]: {0} accepted friendship from {1}", agentID, friendID);
423
417 // 424 //
418 // Notify the friend 425 // Notify the friend
419 // 426 //