aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorMelanie Thielker2009-07-15 00:10:01 +0000
committerMelanie Thielker2009-07-15 00:10:01 +0000
commitfb4067c84493582bd3897eb7aee846c19bf334af (patch)
treeb73a0f99432335c2d30a6acf7a5b3c75b195eba6 /OpenSim/Region/Framework/Scenes/ScenePresence.cs
parentThank you, Twitch, for a patch to restore mayhem and murder to OpenSim (diff)
downloadopensim-SC_OLD-fb4067c84493582bd3897eb7aee846c19bf334af.zip
opensim-SC_OLD-fb4067c84493582bd3897eb7aee846c19bf334af.tar.gz
opensim-SC_OLD-fb4067c84493582bd3897eb7aee846c19bf334af.tar.bz2
opensim-SC_OLD-fb4067c84493582bd3897eb7aee846c19bf334af.tar.xz
A stab at implementing llSetDamage. Not persistent.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index b85a138..56369f5 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3230,7 +3230,12 @@ namespace OpenSim.Region.Framework.Scenes
3230 //if (localid == 0) 3230 //if (localid == 0)
3231 //continue; 3231 //continue;
3232 3232
3233 Health -= coldata[localid] * 5; 3233 SceneObjectPart part = m_scene.GetSceneObjectPart(localid);
3234
3235 if (part != null && part.ParentGroup.Damage != -1.0f)
3236 Health -= part.ParentGroup.Damage;
3237 else
3238 Health -= coldata[localid] * 5;
3234 3239
3235 if (Health <= 0) 3240 if (Health <= 0)
3236 { 3241 {