Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-04-17 18:48:53 +01:00
74 changed files with 1426 additions and 1079 deletions

View File

@@ -33,7 +33,6 @@ using OpenMetaverse;
using OpenSim.Framework;
using OpenSim.Framework.Communications;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Servers.HttpServer;
using OpenSim.Framework.Client;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;