Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-27 20:49:27 +01:00
11 changed files with 68 additions and 73 deletions

View File

@@ -300,7 +300,7 @@ namespace OpenSim.Region.Framework.Scenes
/// ChatToClientsEvent is triggered via ChatModule (or
/// substitutes thereof) when a chat message is actually sent to clients. Clients will only be sent a
/// received chat message if they satisfy various conditions (within audible range, etc.)
/// </summary>
/// </summary>
public delegate void ChatToClientsEvent(
UUID senderID, HashSet<UUID> receiverIDs,
string message, ChatTypeEnum type, Vector3 fromPos, string fromName,
@@ -1660,8 +1660,8 @@ namespace OpenSim.Region.Framework.Scenes
e.Message, e.StackTrace);
}
}
}
}
}
}
public void TriggerOnChatBroadcast(Object sender, OSChatMessage chat)
{