From 42cdf3c240a9cba283fe12576b889e8b46f7b3ce Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Mon, 26 May 2008 11:56:04 +0000 Subject: Adding OnChatBroadcast event logic to EventManager providing a clean interface for Sim broadcasts. Added SimBroadcast support to ChatModule. Removing all code from IRCBridgeModule dealing with agent/client directly. Cleaning up ChatModule. Polishing IRC messages, adding support for "/me" (both directions). --- OpenSim/Region/Environment/Scenes/EventManager.cs | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'OpenSim/Region/Environment/Scenes') diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs index 1c345ba..6cecb6d 100644 --- a/OpenSim/Region/Environment/Scenes/EventManager.cs +++ b/OpenSim/Region/Environment/Scenes/EventManager.cs @@ -217,6 +217,12 @@ namespace OpenSim.Region.Environment.Scenes /// public delegate void ChatFromWorldEvent(Object sender, ChatFromViewerArgs chat); public event ChatFromWorldEvent OnChatFromWorld; + /// + /// ChatBroadcastEvent is called via Scene when a broadcast chat message + /// from world comes in (chat from viewer is available via client.OnChatFromViewer). + /// + public delegate void ChatBroadcastEvent(Object sender, ChatFromViewerArgs chat); + public event ChatBroadcastEvent OnChatBroadcast; public class MoneyTransferArgs : EventArgs { @@ -320,6 +326,7 @@ namespace OpenSim.Region.Environment.Scenes private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps; private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps; private ChatFromWorldEvent handlerChatFromWorld = null; // OnChatFromWorld; + private ChatBroadcastEvent handlerChatBroadcast = null; // OnChatBroadcast; private NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = null; private RequestChangeWaterHeight handlerRequestChangeWaterHeight = null; //OnRequestChangeWaterHeight private ScriptControlEvent handlerScriptControlEvent = null; @@ -699,6 +706,15 @@ namespace OpenSim.Region.Environment.Scenes } } + public void TriggerOnChatBroadcast(Object sender, ChatFromViewerArgs chat) + { + handlerChatBroadcast = OnChatBroadcast; + if (handlerChatBroadcast != null) + { + handlerChatBroadcast(sender, chat); + } + } + internal void TriggerControlEvent(uint p, LLUUID scriptUUID, LLUUID avatarID, uint held, uint _changed) { handlerScriptControlEvent = OnScriptControlEvent; -- cgit v1.1