aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorDr Scofield2008-05-26 11:56:04 +0000
committerDr Scofield2008-05-26 11:56:04 +0000
commit42cdf3c240a9cba283fe12576b889e8b46f7b3ce (patch)
treed5d67f328a4d4ec7c27a949a053f0b6d6c2c8400 /OpenSim/Region/Environment/Scenes
parent* Minor: method documentation fiddling in SceneObjectGroup (diff)
downloadopensim-SC_OLD-42cdf3c240a9cba283fe12576b889e8b46f7b3ce.zip
opensim-SC_OLD-42cdf3c240a9cba283fe12576b889e8b46f7b3ce.tar.gz
opensim-SC_OLD-42cdf3c240a9cba283fe12576b889e8b46f7b3ce.tar.bz2
opensim-SC_OLD-42cdf3c240a9cba283fe12576b889e8b46f7b3ce.tar.xz
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).
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/EventManager.cs16
1 files changed, 16 insertions, 0 deletions
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
217 /// </summary> 217 /// </summary>
218 public delegate void ChatFromWorldEvent(Object sender, ChatFromViewerArgs chat); 218 public delegate void ChatFromWorldEvent(Object sender, ChatFromViewerArgs chat);
219 public event ChatFromWorldEvent OnChatFromWorld; 219 public event ChatFromWorldEvent OnChatFromWorld;
220 /// <summary>
221 /// ChatBroadcastEvent is called via Scene when a broadcast chat message
222 /// from world comes in (chat from viewer is available via client.OnChatFromViewer).
223 /// </summary>
224 public delegate void ChatBroadcastEvent(Object sender, ChatFromViewerArgs chat);
225 public event ChatBroadcastEvent OnChatBroadcast;
220 226
221 public class MoneyTransferArgs : EventArgs 227 public class MoneyTransferArgs : EventArgs
222 { 228 {
@@ -320,6 +326,7 @@ namespace OpenSim.Region.Environment.Scenes
320 private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps; 326 private RegisterCapsEvent handlerRegisterCaps = null; // OnRegisterCaps;
321 private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps; 327 private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps;
322 private ChatFromWorldEvent handlerChatFromWorld = null; // OnChatFromWorld; 328 private ChatFromWorldEvent handlerChatFromWorld = null; // OnChatFromWorld;
329 private ChatBroadcastEvent handlerChatBroadcast = null; // OnChatBroadcast;
323 private NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = null; 330 private NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = null;
324 private RequestChangeWaterHeight handlerRequestChangeWaterHeight = null; //OnRequestChangeWaterHeight 331 private RequestChangeWaterHeight handlerRequestChangeWaterHeight = null; //OnRequestChangeWaterHeight
325 private ScriptControlEvent handlerScriptControlEvent = null; 332 private ScriptControlEvent handlerScriptControlEvent = null;
@@ -699,6 +706,15 @@ namespace OpenSim.Region.Environment.Scenes
699 } 706 }
700 } 707 }
701 708
709 public void TriggerOnChatBroadcast(Object sender, ChatFromViewerArgs chat)
710 {
711 handlerChatBroadcast = OnChatBroadcast;
712 if (handlerChatBroadcast != null)
713 {
714 handlerChatBroadcast(sender, chat);
715 }
716 }
717
702 internal void TriggerControlEvent(uint p, LLUUID scriptUUID, LLUUID avatarID, uint held, uint _changed) 718 internal void TriggerControlEvent(uint p, LLUUID scriptUUID, LLUUID avatarID, uint held, uint _changed)
703 { 719 {
704 handlerScriptControlEvent = OnScriptControlEvent; 720 handlerScriptControlEvent = OnScriptControlEvent;