aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
diff options
context:
space:
mode:
authorMelanie2013-02-07 03:40:48 +0000
committerMelanie2013-02-07 03:40:48 +0000
commit6aa876a83b08390ab057eb012fd2c730010f79d8 (patch)
treedd041d7adf33ea827f535337710e302acb1ba812 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
parentMerge branch 'master' into careminster (diff)
downloadopensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.zip
opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.gz
opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.bz2
opensim-SC-6aa876a83b08390ab057eb012fd2c730010f79d8.tar.xz
Rename Bounciness to Restitution
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPart.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 05b69c1..415a82b 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1736,7 +1736,7 @@ namespace OpenSim.Region.Framework.Scenes
1736 } 1736 }
1737 } 1737 }
1738 1738
1739 public float Bounciness 1739 public float Restitution
1740 { 1740 {
1741 get { return m_bounce; } 1741 get { return m_bounce; }
1742 set 1742 set
@@ -4494,8 +4494,8 @@ namespace OpenSim.Region.Framework.Scenes
4494 GravityModifier = physdata.GravitationModifier; 4494 GravityModifier = physdata.GravitationModifier;
4495 if(Friction != physdata.Friction) 4495 if(Friction != physdata.Friction)
4496 Friction = physdata.Friction; 4496 Friction = physdata.Friction;
4497 if(Bounciness != physdata.Bounce) 4497 if(Restitution != physdata.Bounce)
4498 Bounciness = physdata.Bounce; 4498 Restitution = physdata.Bounce;
4499 } 4499 }
4500 /// <summary> 4500 /// <summary>
4501 /// Update the flags on this prim. This covers properties such as phantom, physics and temporary. 4501 /// Update the flags on this prim. This covers properties such as phantom, physics and temporary.