diff options
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
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/EventManager.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/EventManager.cs | 2 |
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 | |||
947 | OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted; | 947 | OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted; |
948 | if (handlerTerrainTainted != null) | 948 | if (handlerTerrainTainted != null) |
949 | { | 949 | { |
950 | foreach (OnTerrainTickDelegate d in handlerTerrainTainted.GetInvocationList()) | 950 | foreach (OnTerrainTaintedDelegate d in handlerTerrainTainted.GetInvocationList()) |
951 | { | 951 | { |
952 | try | 952 | try |
953 | { | 953 | { |