aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2012-03-29 00:31:11 +0100
committerMelanie2012-03-29 00:31:11 +0100
commit532e3dad26c6a5de8cf0df538a6876ad51ddadf4 (patch)
treefe05ebeb15d5e80ed2dd3cd11214886906f9181d
parentAdd comment about setting client.SceneAgent in AddNewClient() (diff)
downloadopensim-SC_OLD-532e3dad26c6a5de8cf0df538a6876ad51ddadf4.zip
opensim-SC_OLD-532e3dad26c6a5de8cf0df538a6876ad51ddadf4.tar.gz
opensim-SC_OLD-532e3dad26c6a5de8cf0df538a6876ad51ddadf4.tar.bz2
opensim-SC_OLD-532e3dad26c6a5de8cf0df538a6876ad51ddadf4.tar.xz
Pushing the Avination Calling card hooks. Module to follow.
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs21
1 files changed, 17 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index f3982ea..4cc0e19 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -320,7 +320,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
320 //m_log.DebugFormat("[XXX]: OnClientLogin!"); 320 //m_log.DebugFormat("[XXX]: OnClientLogin!");
321 // Inform the friends that this user is online 321 // Inform the friends that this user is online
322 StatusChange(agentID, true); 322 StatusChange(agentID, true);
323 323
324 // Register that we need to send the list of online friends to this user 324 // Register that we need to send the list of online friends to this user
325 lock (m_NeedsListOfOnlineFriends) 325 lock (m_NeedsListOfOnlineFriends)
326 m_NeedsListOfOnlineFriends.Add(agentID); 326 m_NeedsListOfOnlineFriends.Add(agentID);
@@ -609,6 +609,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
609 { 609 {
610 StoreFriendships(client.AgentId, friendID); 610 StoreFriendships(client.AgentId, friendID);
611 611
612 ICallingCardModule ccm = client.Scene.RequestModuleInterface<ICallingCardModule>();
613 if (ccm != null)
614 {
615 ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero);
616 }
617
612 // Update the local cache. 618 // Update the local cache.
613 CacheFriends(client); 619 CacheFriends(client);
614 620
@@ -785,6 +791,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
785 (byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, userID.ToString(), false, Vector3.Zero); 791 (byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, userID.ToString(), false, Vector3.Zero);
786 friendClient.SendInstantMessage(im); 792 friendClient.SendInstantMessage(im);
787 793
794 ICallingCardModule ccm = friendClient.Scene.RequestModuleInterface<ICallingCardModule>();
795 if (ccm != null)
796 {
797 ccm.CreateCallingCard(friendID, userID, UUID.Zero);
798 }
799
800
788 // Update the local cache 801 // Update the local cache
789 CacheFriends(friendClient); 802 CacheFriends(friendClient);
790 803
@@ -807,7 +820,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
807 // we're done 820 // we're done
808 return true; 821 return true;
809 } 822 }
810 823
811 return false; 824 return false;
812 } 825 }
813 826
@@ -859,7 +872,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
859 872
860 public bool LocalStatusNotification(UUID userID, UUID friendID, bool online) 873 public bool LocalStatusNotification(UUID userID, UUID friendID, bool online)
861 { 874 {
862// m_log.DebugFormat("[FRIENDS]: Local Status Notify {0} that user {1} is {2}", friendID, userID, online); 875 //m_log.DebugFormat("[FRIENDS]: Local Status Notify {0} that user {1} is {2}", friendID, userID, online);
863 IClientAPI friendClient = LocateClientObject(friendID); 876 IClientAPI friendClient = LocateClientObject(friendID);
864 if (friendClient != null) 877 if (friendClient != null)
865 { 878 {
@@ -1013,4 +1026,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
1013 } 1026 }
1014 } 1027 }
1015 } 1028 }
1016} \ No newline at end of file 1029}