Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-08-23 23:55:15 +01:00
22 changed files with 126 additions and 287 deletions

View File

@@ -223,4 +223,4 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
OnInstantMessage(null, msg);
}
}
}
}