From 74e3a8549264ca3aa506725c6c39449d2ed195be Mon Sep 17 00:00:00 2001 From: MW Date: Thu, 19 Feb 2009 12:38:17 +0000 Subject: [PATCH] reverted last revision, until we decide how to handle capturing IM's --- .../Avatar/InstantMessage/MessageTransferModule.cs | 14 -------------- .../Framework/Interfaces/IMessageTransferModule.cs | 5 +---- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index b8e0c295d2..38d2d21b42 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs @@ -48,10 +48,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage private List m_Scenes = new List(); private Dictionary m_UserRegionMap = new Dictionary(); - public event ExternalHandleIM OnExternalIMCapture; - - private ExternalHandleIM handlerExternalIMCapture; - public void Initialise(Scene scene, IConfigSource config) { IConfig cnf = config.Configs["Messaging"]; @@ -99,16 +95,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage public void SendInstantMessage(GridInstantMessage im, MessageResultNotification result) { - handlerExternalIMCapture = OnExternalIMCapture; - if (handlerExternalIMCapture != null) - { - if (handlerExternalIMCapture(im)) - { - result(true); - return; - } - } - UUID toAgentID = new UUID(im.toAgentID); m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString()); diff --git a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs index bc194b92ac..40c224d4d0 100644 --- a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs @@ -30,12 +30,9 @@ using OpenSim.Framework; namespace OpenSim.Region.Framework.Interfaces { public delegate void MessageResultNotification(bool success); - public delegate bool ExternalHandleIM(GridInstantMessage im); - + public interface IMessageTransferModule { - event ExternalHandleIM OnExternalIMCapture; - void SendInstantMessage(GridInstantMessage im, MessageResultNotification result); } }