Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor

This commit is contained in:
Melanie
2010-10-10 22:08:54 +01:00
2 changed files with 15 additions and 14 deletions

View File

@@ -215,6 +215,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
if (im.dialog != (byte)InstantMessageDialog.MessageFromObject &&
im.dialog != (byte)InstantMessageDialog.MessageFromAgent &&
im.dialog != (byte)InstantMessageDialog.GroupNotice &&
im.dialog != (byte)InstantMessageDialog.GroupInvitation &&
im.dialog != (byte)InstantMessageDialog.InventoryOffered)
{
return;