4 files changed, 22 insertions, 2 deletions

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 31b94d9..d65dbaf 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -326,6 +326,12 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_rootPart.OwnerID = value; }
         }
 
+        public float Damage
+        {
+            get { return m_rootPart.Damage; }
+            set { m_rootPart.Damage = value; }
+        }
+
         public Color Color
         {
             get { return m_rootPart.Color; }
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index dd00ff4..a4d455c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -195,6 +195,8 @@ namespace OpenSim.Region.Framework.Scenes
 
         [XmlIgnore]
         private PrimFlags LocalFlags = 0;
+        [XmlIgnore]
+        private float m_damage = -1.0f;
         private byte[] m_TextureAnimation;
         private byte m_clickAction = 0;
         private Color m_color = Color.Black;
@@ -484,6 +486,13 @@ namespace OpenSim.Region.Framework.Scenes
             set { m_rezzed = value; }
         }
 
+        [XmlIgnore]
+        public float Damage
+        {
+            get { return m_damage; }
+            set { m_damage = value; }
+        }
+
         /// <summary>
         /// The position of the entire group that this prim belongs to.
         /// </summary>
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)
                 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 1b4674d..c74a41b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3833,7 +3833,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llSetDamage(double damage)
         {
             m_host.AddScriptLPS(1);
-            NotImplemented("llSetDamage");
+            m_host.ParentGroup.Damage = (float)damage;
         }
 
         public void llTeleportAgentHome(string agent)