aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorUbitUmarov2016-07-25 08:38:10 +0100
committerUbitUmarov2016-07-25 08:38:10 +0100
commit1d507f8073558c31031c20828ebaa296623fcdcd (patch)
treefa2811403481cb630167d5db5d9e53df7e62a90e /OpenSim/Region/Framework/Scenes
parentadd give a body to default rootVelocity (diff)
downloadopensim-SC-1d507f8073558c31031c20828ebaa296623fcdcd.zip
opensim-SC-1d507f8073558c31031c20828ebaa296623fcdcd.tar.gz
opensim-SC-1d507f8073558c31031c20828ebaa296623fcdcd.tar.bz2
opensim-SC-1d507f8073558c31031c20828ebaa296623fcdcd.tar.xz
remove extra char
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs8
1 files changed, 6 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 5ea950d..0ccdbf7 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -4797,7 +4797,7 @@ namespace OpenSim.Region.Framework.Scenes
4797 { 4797 {
4798 part = Scene.GetSceneObjectPart(localid); 4798 part = Scene.GetSceneObjectPart(localid);
4799 4799
4800 if(part != null && !part.ParentGroup.IsDeleted && !part.ParentGroup.IsVolumeDetect) 4800 if(part != null && !part.ParentGroup.IsVolumeDetect)
4801 { 4801 {
4802 if (part.ParentGroup.Damage > 0.0f) 4802 if (part.ParentGroup.Damage > 0.0f)
4803 { 4803 {
@@ -4811,10 +4811,14 @@ namespace OpenSim.Region.Framework.Scenes
4811 rvel = coldata[localid].RelativeSpeed; 4811 rvel = coldata[localid].RelativeSpeed;
4812 if(rvel < -5.0f) 4812 if(rvel < -5.0f)
4813 { 4813 {
4814 Health -= 0.005f * rvel * rvel;; 4814 Health -= 0.005f * rvel * rvel;
4815 } 4815 }
4816 } 4816 }
4817 } 4817 }
4818 else
4819 {
4820
4821 }
4818 } 4822 }
4819 4823
4820 if (Health <= 0.0f) 4824 if (Health <= 0.0f)