Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-12-15 22:59:52 +00:00
4 changed files with 257 additions and 240 deletions

View File

@@ -3037,6 +3037,7 @@
<Reference name="OpenSim.Framework.Statistics"/>
<Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Region.CoreModules"/>
<Reference name="OpenSim.Region.OptionalModules"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Services.Interfaces"/>