diff options
author | Melanie | 2010-12-07 03:08:48 +0100 |
---|---|---|
committer | Melanie | 2010-12-07 03:08:48 +0100 |
commit | a4f7937eb338df588c02ce44200876210d0d58c3 (patch) | |
tree | 61d4fca852030ead29366e2617eefddcf89bcd43 | |
parent | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... (diff) | |
download | opensim-SC_OLD-a4f7937eb338df588c02ce44200876210d0d58c3.zip opensim-SC_OLD-a4f7937eb338df588c02ce44200876210d0d58c3.tar.gz opensim-SC_OLD-a4f7937eb338df588c02ce44200876210d0d58c3.tar.bz2 opensim-SC_OLD-a4f7937eb338df588c02ce44200876210d0d58c3.tar.xz |
Add the interface needed to revive calling cards
-rw-r--r-- | OpenSim/Framework/ICallingCardModule.cs | 13 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 13 |
2 files changed, 26 insertions, 0 deletions
diff --git a/OpenSim/Framework/ICallingCardModule.cs b/OpenSim/Framework/ICallingCardModule.cs new file mode 100644 index 0000000..6e343bb --- /dev/null +++ b/OpenSim/Framework/ICallingCardModule.cs | |||
@@ -0,0 +1,13 @@ | |||
1 | using System; | ||
2 | using System.Collections.Generic; | ||
3 | using System.Text; | ||
4 | using OpenMetaverse; | ||
5 | using OpenSim.Framework; | ||
6 | |||
7 | namespace OpenSim.Framework | ||
8 | { | ||
9 | public interface ICallingCardModule | ||
10 | { | ||
11 | void CreateCallingCard(UUID userID, UUID creatorID, UUID folderID); | ||
12 | } | ||
13 | } | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 45c3f49..613a054 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -516,6 +516,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
516 | FriendsService.StoreFriend(agentID, friendID.ToString(), 1); | 516 | FriendsService.StoreFriend(agentID, friendID.ToString(), 1); |
517 | FriendsService.StoreFriend(friendID, agentID.ToString(), 1); | 517 | FriendsService.StoreFriend(friendID, agentID.ToString(), 1); |
518 | 518 | ||
519 | ICallingCardModule ccm = client.Scene.RequestModuleInterface<ICallingCardModule>(); | ||
520 | if (ccm != null) | ||
521 | { | ||
522 | ccm.CreateCallingCard(agentID, friendID, UUID.Zero); | ||
523 | } | ||
524 | |||
519 | // Update the local cache | 525 | // Update the local cache |
520 | UpdateFriendsCache(agentID); | 526 | UpdateFriendsCache(agentID); |
521 | 527 | ||
@@ -679,6 +685,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
679 | (byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, userID.ToString(), false, Vector3.Zero); | 685 | (byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, userID.ToString(), false, Vector3.Zero); |
680 | friendClient.SendInstantMessage(im); | 686 | friendClient.SendInstantMessage(im); |
681 | 687 | ||
688 | ICallingCardModule ccm = friendClient.Scene.RequestModuleInterface<ICallingCardModule>(); | ||
689 | if (ccm != null) | ||
690 | { | ||
691 | ccm.CreateCallingCard(friendID, userID, UUID.Zero); | ||
692 | } | ||
693 | |||
694 | |||
682 | // Update the local cache | 695 | // Update the local cache |
683 | UpdateFriendsCache(friendID); | 696 | UpdateFriendsCache(friendID); |
684 | 697 | ||