Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-03-08 19:10:22 +00:00
35 changed files with 326 additions and 233 deletions

View File

@@ -106,7 +106,7 @@ namespace OpenSim.Region.ClientStack.Linden
scene.EventManager.OnRegisterCaps += OnRegisterCaps;
MainConsole.Instance.Commands.AddCommand(
"event queue",
"Comms",
false,
"debug eq",
"debug eq [0|1]",