ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the plumbing in the offline message module.

Browse Source 
No functionality yet.
This commit is contained in:
Melanie Thielker
2009-03-28 04:02:30 +00:00
parent 0ff7c85a5d
commit b40ec850bb
2 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
View File

@@ -167,6 +167,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
return;
}
HandleUndeliveredMessage(im, result);
return;
}
private void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result)
{
UndeliveredMessage handlerUndeliveredMessage = OnUndeliveredMessage;
// If this event has handlers, then the IM will be considered
@@ -181,7 +188,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
//m_log.DebugFormat("[INSTANT MESSAGE]: Undeliverable");
result(false);
return;
}
/// <summary>
@@ -487,14 +493,14 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (upd.Handle == prevRegionHandle)
{
m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
result(false);
HandleUndeliveredMessage(im, result);
return;
}
}
else
{
m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
result(false);
HandleUndeliveredMessage(im, result);
return;
}
}
@@ -544,18 +550,18 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
else
{
m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", upd.Handle);
result(false);
HandleUndeliveredMessage(im, result);
}
}
else
{
result(false);
HandleUndeliveredMessage(im, result);
}
}
else
{
m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find user {0}", toAgentID);
result(false);
HandleUndeliveredMessage(im, result);
}
}