Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs

1 files changed, 1 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Scenes/EventManager.cs b/OpenSim/Region/Framework/Scenes/EventManager.cs
index 7688cf8..76a952b 100644
--- a/OpenSim/Region/Framework/Scenes/EventManager.cs
+++ b/OpenSim/Region/Framework/Scenes/EventManager.cs
@@ -947,7 +947,7 @@ namespace OpenSim.Region.Framework.Scenes
             OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted;
             if (handlerTerrainTainted != null)
             {
-                foreach (OnTerrainTickDelegate d in handlerTerrainTainted.GetInvocationList())
+                foreach (OnTerrainTaintedDelegate d in handlerTerrainTainted.GetInvocationList())
                 {
                     try
                     {