diff options
| author | Melanie | 2012-06-04 18:22:43 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-04 18:22:43 +0100 |
| commit | d9d4fb10d9244e5ef2f0b655c8288aa6e64fd623 (patch) | |
| tree | bb06c53efb22338bc4e91b8489ecd48144905c52 /OpenSim/Region | |
| parent | Remove the "Profile" config as it's covered by the replaceable interface (diff) | |
| parent | Correct the delegate specification in EventManager.TriggerTerrainTainted. Loo... (diff) | |
| download | opensim-SC-d9d4fb10d9244e5ef2f0b655c8288aa6e64fd623.zip opensim-SC-d9d4fb10d9244e5ef2f0b655c8288aa6e64fd623.tar.gz opensim-SC-d9d4fb10d9244e5ef2f0b655c8288aa6e64fd623.tar.bz2 opensim-SC-d9d4fb10d9244e5ef2f0b655c8288aa6e64fd623.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region')
| -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 f97b0a9..f92ed8e 100644 --- a/OpenSim/Region/Framework/Scenes/EventManager.cs +++ b/OpenSim/Region/Framework/Scenes/EventManager.cs | |||
| @@ -923,7 +923,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 923 | OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted; | 923 | OnTerrainTaintedDelegate handlerTerrainTainted = OnTerrainTainted; |
| 924 | if (handlerTerrainTainted != null) | 924 | if (handlerTerrainTainted != null) |
| 925 | { | 925 | { |
| 926 | foreach (OnTerrainTickDelegate d in handlerTerrainTainted.GetInvocationList()) | 926 | foreach (OnTerrainTaintedDelegate d in handlerTerrainTainted.GetInvocationList()) |
| 927 | { | 927 | { |
| 928 | try | 928 | try |
| 929 | { | 929 | { |