Prevent a nullref if a recipient of a group message gas left the scene

avinationmerge
Melanie 2009-11-15 20:21:46 +00:00
parent 28aa8010b2
commit b7f1fc116e
1 changed files with 14 additions and 11 deletions

View File

@ -164,6 +164,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
List<GridInstantMessage>msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( List<GridInstantMessage>msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>(
"POST", m_RestURL+"/RetrieveMessages/", client.AgentId); "POST", m_RestURL+"/RetrieveMessages/", client.AgentId);
if (msglist != null)
{
foreach (GridInstantMessage im in msglist) foreach (GridInstantMessage im in msglist)
{ {
// client.SendInstantMessage(im); // client.SendInstantMessage(im);
@ -179,6 +181,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
s.EventManager.TriggerIncomingInstantMessage(im); s.EventManager.TriggerIncomingInstantMessage(im);
} }
} }
}
private void UndeliveredMessage(GridInstantMessage im) private void UndeliveredMessage(GridInstantMessage im)
{ {