diff options
| author | Melanie | 2012-05-29 16:58:08 +0200 |
|---|---|---|
| committer | Melanie | 2012-05-29 16:58:08 +0200 |
| commit | c46b31a9b4cc8a1a731b0e109cd2ebd52c1425d6 (patch) | |
| tree | c04b7ba0fd56948fd2e639570397c121b6db9c41 /OpenSim | |
| parent | Merge branch 'avination' (diff) | |
| download | opensim-SC_OLD-c46b31a9b4cc8a1a731b0e109cd2ebd52c1425d6.zip opensim-SC_OLD-c46b31a9b4cc8a1a731b0e109cd2ebd52c1425d6.tar.gz opensim-SC_OLD-c46b31a9b4cc8a1a731b0e109cd2ebd52c1425d6.tar.bz2 opensim-SC_OLD-c46b31a9b4cc8a1a731b0e109cd2ebd52c1425d6.tar.xz | |
Re-add script collisions that were lost in a merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index 225d4c9..1adf13e 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
| @@ -3513,6 +3513,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 3513 | } | 3513 | } |
| 3514 | } | 3514 | } |
| 3515 | 3515 | ||
| 3516 | RaiseCollisionScriptEvents(coldata); | ||
| 3517 | |||
| 3516 | // Gods do not take damage and Invulnerable is set depending on parcel/region flags | 3518 | // Gods do not take damage and Invulnerable is set depending on parcel/region flags |
| 3517 | if (Invulnerable || GodLevel > 0) | 3519 | if (Invulnerable || GodLevel > 0) |
| 3518 | return; | 3520 | return; |