Fix build break

avinationmerge
Melanie 2011-11-14 20:33:39 +00:00
parent afca742392
commit 17f32b7773
1 changed files with 1 additions and 2 deletions

View File

@ -357,7 +357,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
im.offline = 0; im.offline = 0;
im.fromAgentID = fromAgentID.Guid; im.fromAgentID = fromAgentID.Guid;
im.fromAgentName = firstname + " " + lastname; im.fromAgentName = firstname + " " + lastname;
im.offline = (byte)((presence == null) ? 1 : 0);
im.imSessionID = im.fromAgentID; im.imSessionID = im.fromAgentID;
im.message = FriendshipMessage(fid); im.message = FriendshipMessage(fid);
@ -583,7 +582,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
ICallingCardModule ccm = client.Scene.RequestModuleInterface<ICallingCardModule>(); ICallingCardModule ccm = client.Scene.RequestModuleInterface<ICallingCardModule>();
if (ccm != null) if (ccm != null)
{ {
ccm.CreateCallingCard(agentID, friendID, UUID.Zero); ccm.CreateCallingCard(client.AgentId, friendID, UUID.Zero);
} }
// Update the local cache // Update the local cache