diff options
| author | Melanie | 2012-06-06 13:07:05 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-06 13:07:05 +0100 |
| commit | e733fb32cf76672cfddc25b3c9c02c50c025e2db (patch) | |
| tree | 1535c9e7d70cdb5f2e0779db8fc85fb98ede7ca5 /OpenSim/Region/Framework/Scenes/EventManager.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | minor: Change log messages on Warp3DImageModule to show they are from this mo... (diff) | |
| download | opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.zip opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.gz opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.bz2 opensim-SC-e733fb32cf76672cfddc25b3c9c02c50c025e2db.tar.xz | |
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 | { |