aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2009-02-19 12:38:17 +0000
committerMW2009-02-19 12:38:17 +0000
commit74e3a8549264ca3aa506725c6c39449d2ed195be (patch)
treefa3e6a68edd6aab183cbd9932b4eab902e3a9673
parentAdded a event to IMessageTransferModule (and MessageTransferModule) so that o... (diff)
downloadopensim-SC_OLD-74e3a8549264ca3aa506725c6c39449d2ed195be.zip
opensim-SC_OLD-74e3a8549264ca3aa506725c6c39449d2ed195be.tar.gz
opensim-SC_OLD-74e3a8549264ca3aa506725c6c39449d2ed195be.tar.bz2
opensim-SC_OLD-74e3a8549264ca3aa506725c6c39449d2ed195be.tar.xz
reverted last revision, until we decide how to handle capturing IM's
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs14
-rw-r--r--OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs5
2 files changed, 1 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index b8e0c29..38d2d21 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
48 private List<Scene> m_Scenes = new List<Scene>(); 48 private List<Scene> m_Scenes = new List<Scene>();
49 private Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>(); 49 private Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>();
50 50
51 public event ExternalHandleIM OnExternalIMCapture;
52
53 private ExternalHandleIM handlerExternalIMCapture;
54
55 public void Initialise(Scene scene, IConfigSource config) 51 public void Initialise(Scene scene, IConfigSource config)
56 { 52 {
57 IConfig cnf = config.Configs["Messaging"]; 53 IConfig cnf = config.Configs["Messaging"];
@@ -99,16 +95,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
99 95
100 public void SendInstantMessage(GridInstantMessage im, MessageResultNotification result) 96 public void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
101 { 97 {
102 handlerExternalIMCapture = OnExternalIMCapture;
103 if (handlerExternalIMCapture != null)
104 {
105 if (handlerExternalIMCapture(im))
106 {
107 result(true);
108 return;
109 }
110 }
111
112 UUID toAgentID = new UUID(im.toAgentID); 98 UUID toAgentID = new UUID(im.toAgentID);
113 99
114 m_log.DebugFormat("[INSTANT MESSAGE]: Attempting delivery of IM from {0} to {1}", im.fromAgentName, toAgentID.ToString()); 100 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 bc194b9..40c224d 100644
--- a/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IMessageTransferModule.cs
@@ -30,12 +30,9 @@ using OpenSim.Framework;
30namespace OpenSim.Region.Framework.Interfaces 30namespace OpenSim.Region.Framework.Interfaces
31{ 31{
32 public delegate void MessageResultNotification(bool success); 32 public delegate void MessageResultNotification(bool success);
33 public delegate bool ExternalHandleIM(GridInstantMessage im); 33
34
35 public interface IMessageTransferModule 34 public interface IMessageTransferModule
36 { 35 {
37 event ExternalHandleIM OnExternalIMCapture;
38
39 void SendInstantMessage(GridInstantMessage im, MessageResultNotification result); 36 void SendInstantMessage(GridInstantMessage im, MessageResultNotification result);
40 } 37 }
41} 38}