Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-06-15 15:59:49 +01:00
5 changed files with 10 additions and 10 deletions

View File

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