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
                 //if (localid == 0)
                     //continue;
 
-                Health -= coldata[localid] * 5;
+                SceneObjectPart part = m_scene.GetSceneObjectPart(localid);
+
+                if (part != null && part.ParentGroup.Damage != -1.0f)
+                    Health -= part.ParentGroup.Damage;
+                else
+                    Health -= coldata[localid] * 5;
 
                 if (Health <= 0)
                 {