diff options
author | Melanie | 2013-02-07 03:40:48 +0000 |
---|---|---|
committer | Melanie | 2013-02-07 21:25:55 +0000 |
commit | bbda7b94b3fe2350d5413879388cfce7309ca907 (patch) | |
tree | 64a015606e3c158f2a23684324f56a2573ac1a47 /OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |
parent | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP (diff) | |
download | opensim-SC-bbda7b94b3fe2350d5413879388cfce7309ca907.zip opensim-SC-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.gz opensim-SC-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.bz2 opensim-SC-bbda7b94b3fe2350d5413879388cfce7309ca907.tar.xz |
Rename Bounciness to Restitution
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectPart.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs index 8528edc..0d2da03 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||
@@ -1729,7 +1729,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1729 | } | 1729 | } |
1730 | } | 1730 | } |
1731 | 1731 | ||
1732 | public float Bounciness | 1732 | public float Restitution |
1733 | { | 1733 | { |
1734 | get { return m_bounce; } | 1734 | get { return m_bounce; } |
1735 | set | 1735 | set |
@@ -4493,8 +4493,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
4493 | GravityModifier = physdata.GravitationModifier; | 4493 | GravityModifier = physdata.GravitationModifier; |
4494 | if(Friction != physdata.Friction) | 4494 | if(Friction != physdata.Friction) |
4495 | Friction = physdata.Friction; | 4495 | Friction = physdata.Friction; |
4496 | if(Bounciness != physdata.Bounce) | 4496 | if(Restitution != physdata.Bounce) |
4497 | Bounciness = physdata.Bounce; | 4497 | Restitution = physdata.Bounce; |
4498 | } | 4498 | } |
4499 | /// <summary> | 4499 | /// <summary> |
4500 | /// Update the flags on this prim. This covers properties such as phantom, physics and temporary. | 4500 | /// Update the flags on this prim. This covers properties such as phantom, physics and temporary. |