aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Friends
diff options
context:
space:
mode:
authorMelanie Thielker2009-03-29 05:42:27 +0000
committerMelanie Thielker2009-03-29 05:42:27 +0000
commitc483206fd7ecd67ac4fc8c4e4b71f65dfd3de6c4 (patch)
tree74474e6dd9b3ed66c23c1de8af0283d3fbc0e896 /OpenSim/Region/CoreModules/Avatar/Friends
parentFinish the offline IM module (still needs a server). Add rudimentary (diff)
downloadopensim-SC_OLD-c483206fd7ecd67ac4fc8c4e4b71f65dfd3de6c4.zip
opensim-SC_OLD-c483206fd7ecd67ac4fc8c4e4b71f65dfd3de6c4.tar.gz
opensim-SC_OLD-c483206fd7ecd67ac4fc8c4e4b71f65dfd3de6c4.tar.bz2
opensim-SC_OLD-c483206fd7ecd67ac4fc8c4e4b71f65dfd3de6c4.tar.xz
Change the client API to use GridInstantMessage for the "last mile" of IM
sending. With this change, all methods that handle IM now use GridInstantMessage rather than individual parameters.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs8
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index d91e10d..edb2c56 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -679,9 +679,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
679 CreateCallingCard(client, friendID, callingCardFolders[0], friendPresence.Name); 679 CreateCallingCard(client, friendID, callingCardFolders[0], friendPresence.Name);
680 680
681 // local message means OnGridInstantMessage won't be triggered, so do the work here. 681 // local message means OnGridInstantMessage won't be triggered, so do the work here.
682 friendPresence.ControllingClient.SendInstantMessage(agentID, agentID.ToString(), friendID, client.Name, 682 friendPresence.ControllingClient.SendInstantMessage(
683 (byte)InstantMessageDialog.FriendshipAccepted, 683 new GridInstantMessage(client.Scene, agentID,
684 (uint)Util.UnixTimeSinceEpoch()); 684 client.Name, friendID,
685 (byte)InstantMessageDialog.FriendshipAccepted,
686 agentID.ToString(), false, Vector3.Zero));
685 ApproveFriendship(agentID, friendID, client.Name); 687 ApproveFriendship(agentID, friendID, client.Name);
686 } 688 }
687 else 689 else