reverted last revision, until we decide how to handle capturing IM's
parent
1b65020b41
commit
74e3a85492
|
@ -48,10 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
|
||||||
private List<Scene> m_Scenes = new List<Scene>();
|
private List<Scene> m_Scenes = new List<Scene>();
|
||||||
private Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>();
|
private Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>();
|
||||||
|
|
||||||
public event ExternalHandleIM OnExternalIMCapture;
|
|
||||||
|
|
||||||
private ExternalHandleIM handlerExternalIMCapture;
|
|
||||||
|
|
||||||
public void Initialise(Scene scene, IConfigSource config)
|
public void Initialise(Scene scene, IConfigSource config)
|
||||||
{
|
{
|
||||||
IConfig cnf = config.Configs["Messaging"];
|
IConfig cnf = config.Configs["Messaging"];
|
||||||
|
@ -99,16 +95,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
|
||||||
|
|
||||||
public void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
|
public void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
|
||||||
{
|
{
|
||||||
handlerExternalIMCapture = OnExternalIMCapture;
|
|
||||||
if (handlerExternalIMCapture != null)
|
|
||||||
{
|
|
||||||
if (handlerExternalIMCapture(im))
|
|
||||||
{
|
|
||||||
result(true);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
UUID toAgentID = new UUID(im.toAgentID);
|
UUID toAgentID = new UUID(im.toAgentID);
|
||||||
|
|
||||||
m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString());
|
m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString());
|
||||||
|
|
|
@ -30,12 +30,9 @@ using OpenSim.Framework;
|
||||||
namespace OpenSim.Region.Framework.Interfaces
|
namespace OpenSim.Region.Framework.Interfaces
|
||||||
{
|
{
|
||||||
public delegate void MessageResultNotification(bool success);
|
public delegate void MessageResultNotification(bool success);
|
||||||
public delegate bool ExternalHandleIM(GridInstantMessage im);
|
|
||||||
|
|
||||||
public interface IMessageTransferModule
|
public interface IMessageTransferModule
|
||||||
{
|
{
|
||||||
event ExternalHandleIM OnExternalIMCapture;
|
|
||||||
|
|
||||||
void SendInstantMessage(GridInstantMessage im, MessageResultNotification result);
|
void SendInstantMessage(GridInstantMessage im, MessageResultNotification result);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue