OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Re-add script collisions that were lost in a merge

avinationmerge
Melanie 2012-05-29 16:58:08 +02:00
parent 9129a0cce4
commit c46b31a9b4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -3513,6 +3513,8 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
RaiseCollisionScriptEvents(coldata);
// Gods do not take damage and Invulnerable is set depending on parcel/region flags // Gods do not take damage and Invulnerable is set depending on parcel/region flags
if (Invulnerable || GodLevel > 0) if (Invulnerable || GodLevel > 0)
return; return;