From 27e557eb9857ccc34ae3588c4e0ff43bd5e6644a Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Sun, 16 Nov 2008 00:47:21 +0000 Subject: Introduces the message transfer module. It splits the transfer mechanics off the IM module and makes it into a module of it's own, which can be used by all other modules. Removes some ugly hacks. Refer to the IM module to see how it's used. Also fixes the persistence issue (Mantis #2598) --- OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs') diff --git a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs index d9a5393..c291c16 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Groups/GroupsModule.cs @@ -99,7 +99,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups scene.EventManager.OnNewClient += OnNewClient; scene.EventManager.OnClientClosed += OnClientClosed; - scene.EventManager.OnGridInstantMessage += + scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; } @@ -187,11 +187,8 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Groups { } - private void OnGridInstantMessage(GridInstantMessage msg, InstantMessageReceiver whichModule) + private void OnGridInstantMessage(GridInstantMessage msg) { - if ((whichModule & InstantMessageReceiver.GroupsModule) == 0) - return; - // Trigger the above event handler OnInstantMessage(null, new UUID(msg.fromAgentID), new UUID(msg.fromAgentSession), -- cgit v1.1