Merge commit '241e07d006fad1b54e088d8a9ddede0b98a1e800' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
This commit is contained in:
Melanie
2011-10-11 22:41:51 +01:00
3 changed files with 203 additions and 2 deletions

View File

@@ -53,7 +53,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
if (config != null && config.GetBoolean("Enabled", false))
{
scene.RegisterModuleInterface<INPCModule>(this);
scene.EventManager.OnSignificantClientMovement += HandleOnSignificantClientMovement;
// scene.EventManager.OnSignificantClientMovement += HandleOnSignificantClientMovement;
}
}