diff options
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs index 33069da..f24c53c 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
300 | /// ChatToClientsEvent is triggered via ChatModule (or | 300 | /// ChatToClientsEvent is triggered via ChatModule (or |
301 | /// substitutes thereof) when a chat message is actually sent to clients. Clients will only be sent a | 301 | /// substitutes thereof) when a chat message is actually sent to clients. Clients will only be sent a |
302 | /// received chat message if they satisfy various conditions (within audible range, etc.) | 302 | /// received chat message if they satisfy various conditions (within audible range, etc.) |
303 | /// </summary> | 303 | /// </summary> |
304 | public delegate void ChatToClientsEvent( | 304 | public delegate void ChatToClientsEvent( |
305 | UUID senderID, HashSet<UUID> receiverIDs, | 305 | UUID senderID, HashSet<UUID> receiverIDs, |
306 | string message, ChatTypeEnum type, Vector3 fromPos, string fromName, | 306 | string message, ChatTypeEnum type, Vector3 fromPos, string fromName, |
@@ -1660,8 +1660,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1660 | e.Message, e.StackTrace); | 1660 | e.Message, e.StackTrace); |
1661 | } | 1661 | } |
1662 | } | 1662 | } |
1663 | } | 1663 | } |
1664 | } | 1664 | } |
1665 | 1665 | ||
1666 | public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat) | 1666 | public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat) |
1667 | { | 1667 | { |