Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2011-05-08 20:23:06 +01:00
37 changed files with 1554 additions and 418 deletions

View File

@@ -66,8 +66,8 @@ namespace OpenSim.Region.CoreModules.Framework
m_scene = scene;
m_scene.RegisterModuleInterface<ICapabilitiesModule>(this);
MainConsole.Instance.Commands.AddCommand("Capabilities", false, "show caps",
"show capabilities",
"Shows all registered capabilities", CapabilitiesCommand);
"show caps",
"Shows all registered capabilities", CapabilitiesCommand);
}
public void RegionLoaded(Scene scene)