OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Pushing the Avination Calling card hooks. Module to follow.

0.7.3-extended
Melanie 2012-03-29 00:31:11 +01:00 committed by Justin Clark-Casey (justincc)
parent 23d04fa25c
commit 5c2ffa260c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
View File

@ -333,7 +333,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
//m_log.DebugFormat("[XXX]: OnClientLogin!"); //m_log.DebugFormat("[XXX]: OnClientLogin!");
// Inform the friends that this user is online // Inform the friends that this user is online
StatusChange(agentID, true); StatusChange(agentID, true);
// Register that we need to send the list of online friends to this user // Register that we need to send the list of online friends to this user
lock (m_NeedsListOfOnlineFriends) lock (m_NeedsListOfOnlineFriends)
m_NeedsListOfOnlineFriends.Add(agentID); m_NeedsListOfOnlineFriends.Add(agentID);
@ -608,8 +608,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{ {
StoreFriendships(client.AgentId, friendID); StoreFriendships(client.AgentId, friendID);
// Update the local cache ICallingCardModule ccm = client.Scene.RequestModuleInterface<ICallingCardModule>();
RecacheFriends(client); if (ccm != null)
{
ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero);
}
// Update the local cache.
CacheFriends(client);
// //
// Notify the friend // Notify the friend
@ -784,6 +790,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
(byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, userID.ToString(), false, Vector3.Zero); (byte)OpenMetaverse.InstantMessageDialog.FriendshipAccepted, userID.ToString(), false, Vector3.Zero);
friendClient.SendInstantMessage(im); friendClient.SendInstantMessage(im);
ICallingCardModule ccm = friendClient.Scene.RequestModuleInterface<ICallingCardModule>();
if (ccm != null)
{
ccm.CreateCallingCard(friendID, userID, UUID.Zero);
}
// Update the local cache // Update the local cache
RecacheFriends(friendClient); RecacheFriends(friendClient);
@ -806,7 +819,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
// we're done // we're done
return true; return true;
} }
return false; return false;
} }
@ -858,7 +871,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
public bool LocalStatusNotification(UUID userID, UUID friendID, bool online) public bool LocalStatusNotification(UUID userID, UUID friendID, bool online)
{ {
// m_log.DebugFormat("[FRIENDS]: Local Status Notify {0} that user {1} is {2}", friendID, userID, online); //m_log.DebugFormat("[FRIENDS]: Local Status Notify {0} that user {1} is {2}", friendID, userID, online);
IClientAPI friendClient = LocateClientObject(friendID); IClientAPI friendClient = LocateClientObject(friendID);
if (friendClient != null) if (friendClient != null)
{ {