Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-09-25 06:57:53 +01:00

View File

@@ -183,6 +183,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (m_TransferModule != null)
{
im.fromAgentName = client.FirstName + " " + client.LastName;
m_TransferModule.SendInstantMessage(im,
delegate(bool success)
{
@@ -223,4 +224,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
OnInstantMessage(null, msg);
}
}
}
}