Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
root
2011-07-05 04:01:59 +01:00
26 changed files with 766 additions and 315 deletions

View File

@@ -38,7 +38,6 @@ using OpenSim;
using OpenSim.Framework;
using OpenSim.Framework.Console;
using OpenSim.Region.CoreModules.Avatar.NPC;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.ScriptEngine.Shared;