Merge branch 'master' into careminster

This commit is contained in:
Melanie
2011-12-09 22:55:08 +00:00
6 changed files with 106 additions and 16 deletions

View File

@@ -67,11 +67,12 @@ namespace OpenSim.Region.RegionCombinerModule
{
IConfig myConfig = source.Configs["Startup"];
enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false);
//enabledYN = true;
if (enabledYN)
MainConsole.Instance.Commands.AddCommand("RegionCombinerModule", false, "fix-phantoms",
"Fix phantom objects", "Fixes phantom objects after an import to megaregions", FixPhantoms);
}
MainConsole.Instance.Commands.AddCommand(
"RegionCombinerModule", false, "fix-phantoms", "fix-phantoms",
"Fixes phantom objects after an import to megaregions", FixPhantoms);
}
public void Close()
{